Rename Resampler to ResamplingQueue, to avoid conflicts with zita-resampler.

[nageru] / mixer.h

diff --git a/mixer.h b/mixer.h
index 6725a7f46e242fe44bdba8a7c0e583b422b42102..3a19d3aaef946f6257a27a9ae060c0cf057306ba 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -27,7 +27,7 @@
 #include "pbo_frame_allocator.h"
 #include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
-#include "resampler.h"
+#include "resampling_queue.h"
 #include "theme.h"
 #include "timebase.h"
 #include "stereocompressor.h"
@@ -181,7 +181,7 @@ private:
                unsigned dropped_frames = 0;  // Before new_frame.
 
                std::mutex audio_mutex;
-               std::unique_ptr<Resampler> resampler;  // Under audio_mutex.
+               std::unique_ptr<ResamplingQueue> resampling_queue;  // Under audio_mutex.
                int last_timecode = -1;  // Unwrapped.
        };
        CaptureCard cards[MAX_CARDS];  // protected by <bmusb_mutex>