Simplify setting the non-blocking flag when creating HTTP sockets.

[cubemap] / httpinput.h

diff --git a/httpinput.h b/httpinput.h
index ac52bfc34b019e91fa58dc688306d872695ca7f8..4ee5ede87542866182133f23b40b2bb12b8735c7 100644 (file)
--- a/httpinput.h
+++ b/httpinput.h
@@ -1,13 +1,14 @@
 #ifndef _HTTPINPUT_H
 #define _HTTPINPUT_H 1
 
-#include <pthread.h>
 #include <stddef.h>
+#include <mutex>
 #include <string>
 #include <vector>
 
 #include "input.h"
 #include "metacube2.h"
+#include "stream.h"
 
 class InputProto;
 
@@ -93,7 +94,7 @@ private:
        int sock = -1;
 
        // Mutex protecting <stats>.
-       mutable pthread_mutex_t stats_mutex;
+       mutable std::mutex stats_mutex;
 
        // The current statistics for this connection. Protected by <stats_mutex>.
        InputStats stats;
@@ -108,6 +109,12 @@ private:
        // Last time we made a connection with logging enabled.
        // (Initially at some point before the epoch.)
        timespec last_verbose_connection { -3600, 0 };
+
+       // If we've received a Metacube2 PTS metadata block, it belongs to the
+       // next regular block we receive, and is stored here in the meantime.
+       // If we haven't received one yet (or we've already received the
+       // corresponding data block), this is empty, ie., timebase_num == 0.
+       RationalPTS next_block_pts;
 };
 
 #endif  // !defined(_HTTPINPUT_H)