Shutdown microhttpd on shutdown.

[nageru] / httpd.h

diff --git a/httpd.h b/httpd.h
index 21d8746172adc5231820a8c6a676d6bf08ef8ff0..314a34a4a1cd377b2c942b934ca99f2d1dfefee2 100644 (file)
--- a/httpd.h
+++ b/httpd.h
@@ -15,10 +15,12 @@
 #include <string>
 
 struct MHD_Connection;
+struct MHD_Daemon;
 
 class HTTPD {
 public:
        HTTPD();
+       ~HTTPD();
 
        // Should be called before start().
        void set_header(const std::string &data) {
@@ -48,6 +50,12 @@ private:
 
        class Stream {
        public:
+               enum Framing {
+                       FRAMING_RAW,
+                       FRAMING_METACUBE
+               };
+               Stream(Framing framing) : framing(framing) {}
+
                static ssize_t reader_callback_thunk(void *cls, uint64_t pos, char *buf, size_t max);
                ssize_t reader_callback(uint64_t pos, char *buf, size_t max);
 
@@ -57,15 +65,20 @@ private:
                        DATA_TYPE_OTHER
                };
                void add_data(const char *buf, size_t size, DataType data_type);
+               void stop();
 
        private:
+               Framing framing;
+
                std::mutex buffer_mutex;
+               bool should_quit = false;  // Under <buffer_mutex>.
                std::condition_variable has_buffered_data;
-               std::deque<std::string> buffered_data;  // Protected by <mutex>.
+               std::deque<std::string> buffered_data;  // Protected by <buffer_mutex>.
                size_t used_of_buffered_data = 0;  // How many bytes of the first element of <buffered_data> that is already used. Protected by <mutex>.
                size_t seen_keyframe = false;
        };
 
+       MHD_Daemon *mhd = nullptr;
        std::mutex streams_mutex;
        std::set<Stream *> streams;  // Not owned.
        std::string header;