Move stream generation into a new class VideoStream, which will also soon deal with...

[nageru] / player.h

diff --git a/player.h b/player.h
index ab8f0787573799723ec62c6f083d8eb5334db35e..3321a303efc3ed6dc7910649bcb2bf6620f3bd57 100644 (file)
--- a/player.h
+++ b/player.h
@@ -2,17 +2,13 @@
 #define _PLAYER_H 1
 
 #include "clip_list.h"
+#include "video_stream.h"
 
 #include <condition_variable>
 #include <functional>
 #include <mutex>
 
-extern "C" {
-#include <libavformat/avio.h>
-}
-
 class JPEGFrameView;
-class Mux;
 
 class Player {
 public:
@@ -45,10 +41,7 @@ private:
        bool playing = false;  // Under queue_state_mu.
        int override_stream_idx = -1;  // Under queue_state_mu.
 
-       // For streaming.
-       std::unique_ptr<Mux> stream_mux;  // To HTTP.
-       std::string stream_mux_header;
-       bool seen_sync_markers = false;
+       VideoStream video_stream;
 };
 
 #endif  // !defined(_PLAYER_H)