Release Nageru 1.1.0.

[nageru] / mixer.h

diff --git a/mixer.h b/mixer.h
index 32e8168f64cc96a62c3cdc58a51d4773417c7e48..0d375f84b12021101441dcc5b54734e400605619 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -136,6 +136,16 @@ public:
                return theme->map_signal(channel);
        }
 
+       unsigned get_audio_source() const
+       {
+               return audio_source_channel;
+       }
+
+       void set_audio_source(unsigned channel)
+       {
+               audio_source_channel = channel;
+       }
+
        void set_signal_mapping(int signal, int card)
        {
                return theme->set_signal_mapping(signal, card);
@@ -249,8 +259,11 @@ private:
        QSurface *mixer_surface, *h264_encoder_surface;
        std::unique_ptr<movit::ResourcePool> resource_pool;
        std::unique_ptr<Theme> theme;
+       std::atomic<unsigned> audio_source_channel{0};
        std::unique_ptr<movit::EffectChain> display_chain;
        GLuint cbcr_program_num;  // Owned by <resource_pool>.
+       GLuint cbcr_vbo;  // Holds position and texcoord data.
+       GLuint cbcr_position_attribute_index, cbcr_texcoord_attribute_index;
        std::unique_ptr<H264Encoder> h264_encoder;
 
        // Effects part of <display_chain>. Owned by <display_chain>.