X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmixer.cpp;h=26296180ac1371a0f14486849d451639d7a3d092;hb=6c812cc37cb9cb97b22f1d0de02289d5fae2ac00;hp=e61ece2c8158a3a9b7585dca08b87b4429c18691;hpb=c2a16bd46ae760b88345f13e4bdc6f7ab27670b0;p=nageru diff --git a/nageru/mixer.cpp b/nageru/mixer.cpp index e61ece2..2629618 100644 --- a/nageru/mixer.cpp +++ b/nageru/mixer.cpp @@ -631,8 +631,7 @@ void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, CardT assert(card_type == CardType::FFMPEG_INPUT); } - DeviceSpec device; - device = DeviceSpec{InputSourceType::CAPTURE_CARD, card_index}; + DeviceSpec device{InputSourceType::CAPTURE_CARD, card_index}; unsigned num_channels = card_type == CardType::LIVE_CARD ? 8 : 2; if (is_active) { audio_mixer->set_device_parameters(device, card->capture->get_description(), card_type, num_channels, /*active=*/true); @@ -1490,6 +1489,10 @@ start: return !cards[master_card_index].new_frames.empty() || cards[master_card_index].capture->get_disconnected(); }); + if (timed_out) { + fprintf(stderr, "WARNING: Master card (%s) did not deliver a frame for 100 ms, creating a fake one.\n", + description_for_card(master_card_index).c_str()); + } } if (timed_out) {