]> git.sesse.net Git - nageru/commitdiff
Remove unused should_quit member.
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Sun, 29 Apr 2018 10:10:05 +0000 (12:10 +0200)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Thu, 10 May 2018 11:33:19 +0000 (13:33 +0200)
mixer.cpp
mixer.h

index 7a3f437d6ec745048c57be3283005cbf94597937..5d01800fbbcf88b8e2737279acb5ea1555f44b98 100644 (file)
--- 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<mutex> 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 d1bf79519452113a49183e7539596f6c96600010..32a1ea476f21547137e680fb13675c80b6b42835 100644 (file)
--- 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<NewFrame> 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.