summaryrefslogtreecommitdiff
path: root/src/camera.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/camera.cc')
-rw-r--r--src/camera.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/camera.cc b/src/camera.cc
index 26a52a4..de017dc 100644
--- a/src/camera.cc
+++ b/src/camera.cc
@@ -83,11 +83,10 @@ Camera::~Camera()
// Signal to the threads to stop
running = 0;
- /* // FIXME: Add some way to stop a thread object
- pthread_join(decodetid, NULL);
- pthread_join(playertid, NULL);
- pthread_join(encodetid, NULL);
- */
+ // Wait for the threads to stop
+ decoder->wait_stop();
+ encoder->wait_stop();
+ player->wait_stop();
delete decoder;
delete encoder;