Some small restructuring in the audio code.

[nageru] / mixer.h

diff --git a/mixer.h b/mixer.h
index 02c06edfa46f2d8ee12278dee03320efe979e673..33f3a982cbb0519241224bbe67aa605d3b373f56 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -132,6 +132,7 @@ private:
                FrameAllocator::Frame audio_frame, size_t audio_offset, uint16_t audio_format);
        void place_rectangle(movit::Effect *resample_effect, movit::Effect *padding_effect, float x0, float y0, float x1, float y1);
        void thread_func();
+       void process_audio_one_frame();
        void subsample_chroma(GLuint src_tex, GLuint dst_dst);
        void release_display_frame(DisplayFrame *frame);
        double pts() { return double(pts_int) / TIMEBASE; }
@@ -160,11 +161,10 @@ private:
                QSurface *surface;
                QOpenGLContext *context;
 
-               bool new_data_ready = false;  // Whether new_frame and new_frame_audio contains anything.
+               bool new_data_ready = false;  // Whether new_frame contains anything.
                bool should_quit = false;
                RefCountedFrame new_frame;
                GLsync new_data_ready_fence;  // Whether new_frame is ready for rendering.
-               std::vector<float> new_frame_audio;
                std::condition_variable new_data_ready_changed;  // Set whenever new_data_ready is changed.
                unsigned dropped_frames = 0;  // Before new_frame.