X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.cpp;h=5cee30005faee349e8023396b9cd5f98d5072316;hb=4a300e3cab7b1b1ef5a32e1f4a7ec319c48e95e5;hp=23658103e222d94383525e20f07911573c451e4d;hpb=80a2892bbe07a4e065704830e9e7244d2b1139fa;p=nageru diff --git a/mixer.cpp b/mixer.cpp index 2365810..5cee300 100644 --- a/mixer.cpp +++ b/mixer.cpp @@ -1018,7 +1018,7 @@ void Mixer::thread_func() } else { master_card_is_output = false; master_card_index = theme->map_signal(master_clock_channel); - assert(master_card_index < num_cards); + assert(master_card_index < num_cards + num_video_inputs); } OutputFrameInfo output_frame_info = get_one_frame_from_each_card(master_card_index, master_card_is_output, new_frames, has_new_frame); @@ -1587,6 +1587,17 @@ map Mixer::get_available_output_video_modes() const return cards[desired_output_card_index].output->get_available_video_modes(); } +string Mixer::get_ffmpeg_filename(unsigned card_index) const +{ + assert(card_index >= num_cards && card_index < num_cards + num_video_inputs); + return ((FFmpegCapture *)(cards[card_index].capture.get()))->get_filename(); +} + +void Mixer::set_ffmpeg_filename(unsigned card_index, const string &filename) { + assert(card_index >= num_cards && card_index < num_cards + num_video_inputs); + ((FFmpegCapture *)(cards[card_index].capture.get()))->change_filename(filename); +} + Mixer::OutputChannel::~OutputChannel() { if (has_current_frame) {