Rename _playing_condition -> _thread_work_condition.

diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc
index 0e4bcb671b88cfbebdba84ac0fe55a6b42169fe8..2300cc6984e305df1348e963aad2c3600fe09263 100644 (file)
--- 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 84d97c751f859bf3f24a7e08fffa9b5a1f9cae54..f129b6ed5a4b51b503a81e7532fdc3a2c05d8212 100644 (file)
--- 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;