Moved mjpg_streamer to a separate dir

examples/mjpg_streamer/Makefile

+# Copyright (c) 2014 Cesanta Software
+# All rights reserved
+
+PROG = mjpg_streamer
+CFLAGS = -W -Wall -I../.. -g -O0 $(CFLAGS_EXTRA)
+SOURCES = $(PROG).c ../../mongoose.c
+
+$(PROG): $(SOURCES)
+	$(CC) -o $(PROG) $(SOURCES) $(CFLAGS)
+
+clean:
+	rm -rf $(PROG) *.exe *.dSYM *.obj *.exp .*o *.lib

examples/mjpg.c → examples/mjpg_streamer/mjpg_streamer.c

@@ -12,8 +12,8 @@ static void send_file(struct mg_connection *conn, const char *path) {
   FILE *fp;
 
   if (stat(path, &st) == 0 && (fp = fopen(path, "rb")) != NULL) {
-    mg_printf(conn, "--myboundary\r\nContent-Type: image/jpeg\r\n"
-              "Content-Length: %llu\r\n\r\n", (unsigned long long) st.st_size);
+    mg_printf(conn, "--w00t\r\nContent-Type: image/jpeg\r\n"
+              "Content-Length: %lu\r\n\r\n", (unsigned long) st.st_size);
     while ((n = fread(buf, 1, sizeof(buf), fp)) > 0) {
       mg_write(conn, buf, n);
     }
@@ -30,47 +30,58 @@ struct conn_state {
 static int ev_handler(struct mg_connection *conn, enum mg_event ev) {
   const char **file_names = (const char **) conn->server_param;
   struct conn_state *state;
-  int result = MG_FALSE;
-
-  if (ev == MG_REQUEST) {
-    mg_printf(conn, "%s",
-              "HTTP/1.0 200 OK\r\n" "Cache-Control: no-cache\r\n"
-              "Pragma: no-cache\r\nExpires: Thu, 01 Dec 1994 16:00:00 GMT\r\n"
-              "Connection: close\r\nContent-Type: multipart/x-mixed-replace; "
-              "boundary=--myboundary\r\n\r\n");
-
-    send_file(conn, file_names[0]);
-
-    state = (struct conn_state *) malloc(sizeof(*state));
-    conn->connection_param = state;
-    state->file_index = 1;  // First file is already sent
-    state->last_poll = time(NULL);
-    result = MG_MORE;
-
-  } else if (ev == MG_POLL) {
-
-    time_t now = time(NULL);
-    state = (struct conn_state *) conn->connection_param;
-
-    if (state != NULL && now > state->last_poll) {
-      if (file_names[state->file_index] != NULL) {
-        send_file(conn, file_names[state->file_index]);
-        state->file_index++;
-        if (file_names[state->file_index] == NULL) {
-          result = MG_TRUE;  // No more images, close connection
+  time_t now = time(NULL);
+
+  switch (ev) {
+
+    case MG_AUTH:
+      return MG_TRUE;
+
+    case MG_REQUEST:
+      if (strcmp(conn->uri, "/stream") != 0) {
+        mg_send_header(conn, "Content-Type", "text/html");
+        mg_printf_data(conn, "%s",
+                       "Go to <a href=/stream>/stream</a> for MJPG stream");
+        return MG_TRUE;
+      }
+
+      mg_printf(conn, "%s",
+                "HTTP/1.0 200 OK\r\n" "Cache-Control: no-cache\r\n"
+                "Pragma: no-cache\r\nExpires: Thu, 01 Dec 1994 16:00:00 GMT\r\n"
+                "Connection: close\r\nContent-Type: multipart/x-mixed-replace; "
+                "boundary=--w00t\r\n\r\n");
+
+      send_file(conn, file_names[0]);
+
+      state = (struct conn_state *) malloc(sizeof(*state));
+      conn->connection_param = state;
+      state->file_index = 1;  // First file is already sent
+      state->last_poll = time(NULL);
+      return MG_MORE;
+
+    case MG_POLL:
+      state = (struct conn_state *) conn->connection_param;
+
+      if (state != NULL && now > state->last_poll) {
+        if (file_names[state->file_index] != NULL) {
+          send_file(conn, file_names[state->file_index]);
+          state->file_index++;
+          if (file_names[state->file_index] == NULL) {
+            return MG_TRUE;  // No more images, close connection
+          }
         }
+        state->last_poll = now;
       }
-      state->last_poll = now;
-    }
+      return MG_FALSE;
 
-  } else if (ev == MG_CLOSE) {
-    free(conn->connection_param);
-    conn->connection_param = NULL;
-  } else if (ev == MG_AUTH) {
-    result = MG_TRUE;
-  }
+    case MG_CLOSE:
+      free(conn->connection_param);
+      conn->connection_param = NULL;
+      return MG_FALSE;
 
-  return result;
+    default:
+      return MG_FALSE;
+  }
 }
 
 int main(int argc, char *argv[]) {