Make the VideoEncoder own the stream audio encoder (and make it unconditionally)...

[nageru] / quicksync_encoder.h

diff --git a/quicksync_encoder.h b/quicksync_encoder.h
index 994987ebd6afaf8f517e5d7c32a90f8b8fa498bc..9ec7c85b88a28e76777b8474ec6449fdd61eceaa 100644 (file)
--- a/quicksync_encoder.h
+++ b/quicksync_encoder.h
@@ -33,10 +33,11 @@
 #include <string>
 #include <vector>
 
-#include "mux.h"
 #include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
 
+class AudioEncoder;
+class Mux;
 class QuickSyncEncoderImpl;
 class QSurface;
 
@@ -45,7 +46,7 @@ class QSurface;
 // .cpp file.
 class QuickSyncEncoder {
 public:
-        QuickSyncEncoder(const std::string &filename, QSurface *surface, const std::string &va_display, int width, int height, Mux *stream_mux);
+        QuickSyncEncoder(const std::string &filename, QSurface *surface, const std::string &va_display, int width, int height, Mux *stream_mux, AudioEncoder *stream_audio_encoder);
         ~QuickSyncEncoder();
 
        void add_audio(int64_t pts, std::vector<float> audio);