projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
blade and hard egdes, undo cache reset bug, sams ladspa icons, theme image access...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
vwindow.C
diff --git
a/cinelerra-5.1/cinelerra/vwindow.C
b/cinelerra-5.1/cinelerra/vwindow.C
index 2f96447c4674981ebbc5d21438b8fd322e9f267e..e22dcde06972f8b47a193c60ba12bbf8946fc051 100644
(file)
--- a/
cinelerra-5.1/cinelerra/vwindow.C
+++ b/
cinelerra-5.1/cinelerra/vwindow.C
@@
-340,9
+340,13
@@
void VWindow::update_position(int change_type,
}
}
}
}
-
-
-
+void VWindow::stop_playback()
+{
+ int locked = gui->get_window_lock();
+ if( locked ) gui->unlock_window();
+ playback_engine->interrupt_playback(1);
+ if( locked ) gui->lock_window("VWindow::stop_playback");
+}
int VWindow::update_position(double position)
{
int VWindow::update_position(double position)
{
@@
-425,10
+429,8
@@
void VWindow::copy()
const char *file_string = file.string();
long file_length = strlen(file_string);
mwindow->gui->lock_window();
const char *file_string = file.string();
long file_length = strlen(file_string);
mwindow->gui->lock_window();
- mwindow->gui->get_clipboard()->to_clipboard(file_string, file_length,
- SECONDARY_SELECTION);
- mwindow->gui->get_clipboard()->to_clipboard(file_string, file_length,
- BC_PRIMARY_SELECTION);
+ mwindow->gui->to_clipboard(file_string, file_length, BC_PRIMARY_SELECTION);
+ mwindow->gui->to_clipboard(file_string, file_length, SECONDARY_SELECTION);
mwindow->gui->unlock_window();
}
}
mwindow->gui->unlock_window();
}
}