From: Steinar H. Gunderson Date: Fri, 23 Mar 2018 15:17:46 +0000 (+0100) Subject: Fix compilation without CEF. X-Git-Tag: 1.7.1~10 X-Git-Url: https://git.sesse.net/?p=nageru;a=commitdiff_plain;h=9a5e117a8d1fdd8af2e9ea89dfe02b2d28b8849b Fix compilation without CEF. --- diff --git a/bmusb b/bmusb index e287f28..6a012a4 160000 --- a/bmusb +++ b/bmusb @@ -1 +1 @@ -Subproject commit e287f28087aef9cfd6aa47acd0d283bc177a9d70 +Subproject commit 6a012a41c5422092cdac1f18a9019f37c0b85368 diff --git a/mixer.cpp b/mixer.cpp index d092516..b3e95a7 100644 --- 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;