X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.h;h=354735da57d9e7a6880a18a6bab5f7cc3350ccbb;hb=8321b1cf93126b79302a6610bcb6e1b426f76c3d;hp=31ae7ae907f79fc1c2ef8f875fb2f9f89a940ed8;hpb=95c6bc9d8e340b02112f713389390102d547cc4c;p=nageru

diff --git a/mixer.h b/mixer.h
index 31ae7ae..354735d 100644
--- a/mixer.h
+++ b/mixer.h
@@ -382,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;
 
@@ -445,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;