http_send.c: Kill HTTP_SENT_OK_MSG.
authorAndre Noll <maan@systemlinux.org>
Sat, 2 Feb 2008 12:49:25 +0000 (13:49 +0100)
committerAndre Noll <maan@systemlinux.org>
Sat, 2 Feb 2008 12:49:25 +0000 (13:49 +0100)
We might as well go directly to the HTTP_STREAMING state.

http_send.c

index 25d9ac1..18ad9a5 100644 (file)
@@ -36,8 +36,6 @@ enum http_status {
        HTTP_CONNECTED,
        /** Successfully received the get request. */
        HTTP_GOT_GET_REQUEST,
-       /** We sent the OK message back to the client. */
-       HTTP_SENT_OK_MSG,
        /** Connection is ready for sending audio data. */
        HTTP_STREAMING,
        /** We didn't receive a valid get request. */
@@ -228,7 +226,7 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
                        break;
                case HTTP_GOT_GET_REQUEST: /* need to send ok msg */
                        if (hc->check_w && FD_ISSET(hc->fd, wfds)) {
-                               hc->status = HTTP_SENT_OK_MSG;
+                               hc->status = HTTP_STREAMING;
                                http_send_ok_msg(hc);
                        }
                        break;
@@ -239,10 +237,6 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
                                                "invalid get request");
                        }
                        break;
-               case HTTP_SENT_OK_MSG: /* need to send header? */
-                       if (hc->check_w && FD_ISSET(hc->fd, wfds))
-                               hc->status = HTTP_STREAMING;
-                       break;
                }
        }
        if (!FD_ISSET(listen_fd, rfds))
@@ -308,12 +302,6 @@ static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
                        para_fd_set(hc->fd, wfds, max_fileno);
                        hc->check_w = 1;
                        break;
-               case HTTP_SENT_OK_MSG:
-                       if (!vss_playing())
-                               break; /* wait until server starts playing */
-                       para_fd_set(hc->fd, wfds, max_fileno);
-                       hc->check_w = 1;
-                       break;
                }
        }
 }