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

[nageru] / mixer.cpp

diff --git a/mixer.cpp b/mixer.cpp
index 7624c8013823ca5c67e119503cb306a449438eda..e0371429bc9dc3f678ffb80d0dfb37bf6c3bfdd6 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -569,9 +569,9 @@ void Mixer::thread_func()
        int stats_dropped_frames = 0;
 
        while (!should_quit) {
-               CaptureCard::NewFrame new_frames[MAX_CARDS];
-               bool has_new_frame[MAX_CARDS] = { false };
-               int num_samples[MAX_CARDS] = { 0 };
+               CaptureCard::NewFrame new_frames[MAX_VIDEO_CARDS];
+               bool has_new_frame[MAX_VIDEO_CARDS] = { false };
+               int num_samples[MAX_VIDEO_CARDS] = { 0 };
 
                unsigned master_card_index = theme->map_signal(master_clock_channel);
                assert(master_card_index < num_cards);
@@ -681,7 +681,7 @@ void Mixer::thread_func()
        resource_pool->clean_context();
 }
 
-void Mixer::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 Mixer::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])
 {
 start:
        // The first card is the master timer, so wait for it to have a new frame.