Consistently use “video card” instead of “card”.

[nageru] / mixer.h

diff --git a/mixer.h b/mixer.h
index 547691428ad5fcfe60f5f1720c5d4a36514e2fb2..354735da57d9e7a6880a18a6bab5f7cc3350ccbb 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -3,31 +3,37 @@
 
 // The actual video mixer, running in its own separate background thread.
 
+#include <assert.h>
 #include <epoxy/gl.h>
 #undef Success
-#include <stdbool.h>
-#include <stdint.h>
 
 #include <movit/effect_chain.h>
 #include <movit/flat_input.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include <zita-resampler/resampler.h>
+
 #include <atomic>
 #include <chrono>
 #include <condition_variable>
 #include <cstddef>
 #include <functional>
+#include <map>
 #include <memory>
 #include <mutex>
+#include <queue>
 #include <string>
 #include <thread>
 #include <vector>
 
-#include "bmusb/bmusb.h"
 #include "alsa_output.h"
 #include "audio_mixer.h"
+#include "bmusb/bmusb.h"
+#include "correlation_measurer.h"
+#include "defs.h"
 #include "ebu_r128_proc.h"
-#include "video_encoder.h"
 #include "httpd.h"
+#include "input_state.h"
 #include "pbo_frame_allocator.h"
 #include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
@@ -35,12 +41,11 @@
 #include "theme.h"
 #include "timebase.h"
 #include "stereocompressor.h"
-#include "filter.h"
-#include "input_state.h"
-#include "correlation_measurer.h"
+#include "video_encoder.h"
 
-class QuickSyncEncoder;
+class ALSAOutput;
 class QSurface;
+class QuickSyncEncoder;
 namespace movit {
 class Effect;
 class EffectChain;
@@ -377,9 +382,9 @@ private:
 
                int last_timecode = -1;  // Unwrapped.
        };
-       CaptureCard cards[MAX_CARDS];  // protected by <bmusb_mutex>
+       CaptureCard cards[MAX_VIDEO_CARDS];  // protected by <bmusb_mutex>
        AudioMixer audio_mixer;
-       void get_one_frame_from_each_card(unsigned master_card_index, CaptureCard::NewFrame new_frames[MAX_CARDS], bool has_new_frame[MAX_CARDS], int num_samples[MAX_CARDS]);
+       void get_one_frame_from_each_card(unsigned master_card_index, CaptureCard::NewFrame new_frames[MAX_VIDEO_CARDS], bool has_new_frame[MAX_VIDEO_CARDS], int num_samples[MAX_VIDEO_CARDS]);
 
        InputState input_state;
 
@@ -440,10 +445,10 @@ private:
        std::queue<AudioTask> audio_task_queue;  // Under audio_mutex.
 
        // For mode scanning.
-       bool is_mode_scanning[MAX_CARDS]{ false };
-       std::vector<uint32_t> mode_scanlist[MAX_CARDS];
-       unsigned mode_scanlist_index[MAX_CARDS]{ 0 };
-       std::chrono::steady_clock::time_point last_mode_scan_change[MAX_CARDS];
+       bool is_mode_scanning[MAX_VIDEO_CARDS]{ false };
+       std::vector<uint32_t> mode_scanlist[MAX_VIDEO_CARDS];
+       unsigned mode_scanlist_index[MAX_VIDEO_CARDS]{ 0 };
+       std::chrono::steady_clock::time_point last_mode_scan_change[MAX_VIDEO_CARDS];
 };
 
 extern Mixer *global_mixer;