projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add zoom slider, fix stop_playback on quit, new msg.txt, rework filelist
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
mwindow.C
diff --git
a/cinelerra-5.1/cinelerra/mwindow.C
b/cinelerra-5.1/cinelerra/mwindow.C
index 3887a8daa887962dde2c3cb33e033cf37a2a625d..75dc29acaa32d70f80126e10c741c780e9620622 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mwindow.C
+++ b/
cinelerra-5.1/cinelerra/mwindow.C
@@
-231,6
+231,7
@@
MWindow::MWindow()
MWindow::~MWindow()
{
run_lock->lock("MWindow::~MWindow");
MWindow::~MWindow()
{
run_lock->lock("MWindow::~MWindow");
+ stop_playback(1);
in_destructor = 1;
//printf("MWindow::~MWindow %d\n", __LINE__);
gui->stop_drawing();
in_destructor = 1;
//printf("MWindow::~MWindow %d\n", __LINE__);
gui->stop_drawing();
@@
-1334,17
+1335,12
@@
void MWindow::stop_playback(int wait)
int locked = gui->get_window_lock();
if( locked ) gui->unlock_window();
int locked = gui->get_window_lock();
if( locked ) gui->unlock_window();
- cwindow->playback_engine->que->send_command(STOP,
- CHANGE_NONE,
- 0,
- 0);
- cwindow->playback_engine->interrupt_playback(wait);
+ cwindow->playback_engine->stop_playback();
for(int i = 0; i < vwindows.size(); i++) {
VWindow *vwindow = vwindows[i];
if( !vwindow->is_running() ) continue;
for(int i = 0; i < vwindows.size(); i++) {
VWindow *vwindow = vwindows[i];
if( !vwindow->is_running() ) continue;
- vwindow->playback_engine->que->send_command(STOP, CHANGE_NONE, 0, 0);
- vwindow->playback_engine->interrupt_playback(wait);
+ vwindow->playback_engine->stop_playback();
}
if( locked ) gui->lock_window("MWindow::stop_playback");
}
}
if( locked ) gui->lock_window("MWindow::stop_playback");
}