projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cin_db Makefile tweak, awdw vicon stop draw lock rework,
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
awindowgui.C
diff --git
a/cinelerra-5.1/cinelerra/awindowgui.C
b/cinelerra-5.1/cinelerra/awindowgui.C
index d71d1588715e1e58e4d0f69028d38c5ba95e3edc..4688e7bc04cead9a205e6a0fd67288640dc10b25 100644
(file)
--- a/
cinelerra-5.1/cinelerra/awindowgui.C
+++ b/
cinelerra-5.1/cinelerra/awindowgui.C
@@
-612,22
+612,10
@@
AssetVIconThread::AssetVIconThread(AWindowGUI *gui, Preferences *preferences)
case VICON_COLOR_MODE_HIGH: vicon_cmodel = BC_RGB888; break;
}
this->vicon_cmodel = vicon_cmodel;
case VICON_COLOR_MODE_HIGH: vicon_cmodel = BC_RGB888; break;
}
this->vicon_cmodel = vicon_cmodel;
- this->draw_lock = new Mutex("AssetVIconThread::draw_lock");
}
AssetVIconThread::~AssetVIconThread()
{
}
AssetVIconThread::~AssetVIconThread()
{
- delete draw_lock;
-}
-
-void AssetVIconThread::drawing_started()
-{
- draw_lock->lock("AssetVIconThread::drawing_started");
-}
-
-void AssetVIconThread::drawing_stopped()
-{
- draw_lock->unlock();
}
void AssetVIconThread::set_view_popup(AssetVIcon *v, int draw_mode)
}
void AssetVIconThread::set_view_popup(AssetVIcon *v, int draw_mode)
@@
-691,10
+679,8
@@
ViewPopup *AssetVIconThread::new_view_window(ViewPopup *vpopup)
void AssetVIconThread::stop_vicon_drawing(int wait)
{
stop_drawing();
void AssetVIconThread::stop_vicon_drawing(int wait)
{
stop_drawing();
- if( wait ) {
- drawing_started(); // waits for draw lock
- drawing_stopped();
- }
+ gui->lock_window("AssetVIconThread::stop_vicon_drawing");
+ gui->unlock_window();
}
}