]> git.sesse.net Git - nageru/blobdiff - nageru/mixer.cpp
When the master card times out, print a message.
[nageru] / nageru / mixer.cpp
index e61ece2c8158a3a9b7585dca08b87b4429c18691..26296180ac1371a0f14486849d451639d7a3d092 100644 (file)
@@ -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) {