From e2facfa5c5d6afba4cb8b8abac2cadf26378d925 Mon Sep 17 00:00:00 2001 From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com> Date: Fri, 20 Sep 2013 16:13:13 -0400 Subject: [PATCH] #30433: video_mixer: use std::lock_guard than std::unique_lock --- daemon/src/video/video_mixer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/daemon/src/video/video_mixer.cpp b/daemon/src/video/video_mixer.cpp index f1f15ee7db..65faba31b8 100644 --- a/daemon/src/video/video_mixer.cpp +++ b/daemon/src/video/video_mixer.cpp @@ -69,19 +69,19 @@ VideoMixer::~VideoMixer() void VideoMixer::attached(Observable<VideoFrameSP>* ob) { - std::unique_lock<std::mutex> lk(mutex_); + std::lock_guard<std::mutex> lk(mutex_); sources_.push_back(ob); } void VideoMixer::detached(Observable<VideoFrameSP>* ob) { - std::unique_lock<std::mutex> lk(mutex_); + std::lock_guard<std::mutex> lk(mutex_); sources_.remove(ob); } void VideoMixer::update(Observable<VideoFrameSP>* ob, VideoFrameSP& frame_p) { - std::unique_lock<std::mutex> lk(mutex_); + std::lock_guard<std::mutex> lk(mutex_); int i=0; for (auto x : sources_) { if (x == ob) break; @@ -132,7 +132,7 @@ void VideoMixer::render_frame(VideoFrame& input, const int index) void VideoMixer::setDimensions(int width, int height) { - std::unique_lock<std::mutex> lk(mutex_); + std::lock_guard<std::mutex> lk(mutex_); width_ = width; height_ = height; -- GitLab