From 89d920f2f90fc8412caa1ea36ecf10132654ddcb Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sun, 29 Apr 2018 12:10:05 +0200 Subject: [PATCH] Remove unused should_quit member. --- mixer.cpp | 5 ----- mixer.h | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/mixer.cpp b/mixer.cpp index 7a3f437..5d01800 100644 --- a/mixer.cpp +++ b/mixer.cpp @@ -503,11 +503,6 @@ Mixer::~Mixer() BMUSBCapture::stop_bm_thread(); for (unsigned card_index = 0; card_index < num_cards + num_video_inputs + num_html_inputs; ++card_index) { - { - unique_lock lock(card_mutex); - cards[card_index].should_quit = true; // Unblock thread. - cards[card_index].new_frames_changed.notify_all(); - } cards[card_index].capture->stop_dequeue_thread(); if (cards[card_index].output) { cards[card_index].output->end_output(); diff --git a/mixer.h b/mixer.h index d1bf795..32a1ea4 100644 --- a/mixer.h +++ b/mixer.h @@ -532,8 +532,7 @@ private: std::chrono::steady_clock::time_point received_timestamp = std::chrono::steady_clock::time_point::min(); }; std::deque new_frames; - bool should_quit = false; - std::condition_variable new_frames_changed; // Set whenever new_frames (or should_quit) is changed. + std::condition_variable new_frames_changed; // Set whenever new_frames is changed. QueueLengthPolicy queue_length_policy; // Refers to the "new_frames" queue. -- 2.39.2