X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.h;h=f5aa4fbdd014758faa047f21bc4dfdf701467a81;hb=5cd2e667b7531777991c98dc6d3249e95b98314c;hp=f5e72e42e237a5a1df16152b4a3b28aac34d24fb;hpb=1d75037f1e47e1e86adc444417922b402ba8272a;p=nageru diff --git a/mixer.h b/mixer.h index f5e72e4..f5aa4fb 100644 --- a/mixer.h +++ b/mixer.h @@ -5,13 +5,11 @@ #include #include + #undef Success -#include -#include #include #include - #include #include #include @@ -25,34 +23,28 @@ #include #include -#include "alsa_output.h" #include "audio_mixer.h" #include "bmusb/bmusb.h" #include "defs.h" #include "httpd.h" #include "input_state.h" +#include "libusb.h" #include "pbo_frame_allocator.h" #include "ref_counted_frame.h" #include "ref_counted_gl_sync.h" -#include "resampling_queue.h" #include "theme.h" #include "timebase.h" -#include "stereocompressor.h" #include "video_encoder.h" class ALSAOutput; class QSurface; -class QuickSyncEncoder; + namespace movit { class Effect; class EffectChain; class FlatInput; class ResourcePool; } // namespace movit - -namespace movit { -class YCbCrInput; -} class QSurfaceFormat; // For any card that's not the master (where we pick out the frames as they @@ -199,16 +191,6 @@ 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; - } - unsigned get_master_clock() const { return master_clock_channel;