diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-06-28 00:49:54 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-06-28 00:49:54 +0200 |
| commit | 91152d27421ae3674c782a644e23df1a9dbc8f42 (patch) | |
| tree | b159ac36884f8f7c578d999ff33dd7e3012f2773 | |
| parent | 76fa6543691330bcbf911ab77b2e1133fb70ada7 (diff) | |
Rename _playing_condition -> _thread_work_condition.
| -rw-r--r-- | src/wx/gl_video_view.cc | 6 | ||||
| -rw-r--r-- | src/wx/gl_video_view.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc index 0e4bcb671..2300cc698 100644 --- a/src/wx/gl_video_view.cc +++ b/src/wx/gl_video_view.cc @@ -303,7 +303,7 @@ GLVideoView::start () boost::mutex::scoped_lock lm (_playing_mutex); _playing = true; - _playing_condition.notify_all (); + _thread_work_condition.notify_all (); } void @@ -326,7 +326,7 @@ try while (true) { boost::mutex::scoped_lock lm (_playing_mutex); while (!_playing && !_one_shot) { - _playing_condition.wait (lm); + _thread_work_condition.wait (lm); } _one_shot = false; lm.unlock (); @@ -386,7 +386,7 @@ GLVideoView::request_one_shot () { boost::mutex::scoped_lock lm (_playing_mutex); _one_shot = true; - _playing_condition.notify_all (); + _thread_work_condition.notify_all (); } void diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h index 84d97c751..f129b6ed5 100644 --- a/src/wx/gl_video_view.h +++ b/src/wx/gl_video_view.h @@ -71,7 +71,7 @@ private: boost::thread _thread; boost::mutex _playing_mutex; - boost::condition _playing_condition; + boost::condition _thread_work_condition; bool _playing; bool _one_shot; |