]> git.sesse.net Git - nageru/commitdiff
Fix compilation without CEF.
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Fri, 23 Mar 2018 15:17:46 +0000 (16:17 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Fri, 23 Mar 2018 15:17:46 +0000 (16:17 +0100)
bmusb
mixer.cpp

diff --git a/bmusb b/bmusb
index e287f28087aef9cfd6aa47acd0d283bc177a9d70..6a012a41c5422092cdac1f18a9019f37c0b85368 160000 (submodule)
--- a/bmusb
+++ b/bmusb
@@ -1 +1 @@
-Subproject commit e287f28087aef9cfd6aa47acd0d283bc177a9d70
+Subproject commit 6a012a41c5422092cdac1f18a9019f37c0b85368
index d0925167e663cd522dcf6e1349cbbd341ce6d023..b3e95a7be5ec97782e398df22743d5d78fad1f6f 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -1187,6 +1187,7 @@ start:
                CaptureCard *card = &cards[card_index];
                if (card->new_frames.empty()) {  // Starvation.
                        ++card->metric_input_duped_frames;
+#ifdef HAVE_CEF
                        if (card->is_cef_capture && card->may_have_dropped_last_frame) {
                                // Unlike other sources, CEF is not guaranteed to send us a steady
                                // stream of frames, so we'll have to ask it to repaint the frame
@@ -1195,6 +1196,7 @@ start:
                                // get a new frame.)
                                ((CEFCapture *)card->capture.get())->request_new_frame();
                        }
+#endif
                } else {
                        new_frames[card_index] = move(card->new_frames.front());
                        has_new_frame[card_index] = true;