projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
viewer window playback tweaks
[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 428a7b2310ea2eb3eca08145c11d54682b686412..8de4eb73170154add8af0a090bb621e81107e84c 100644
(file)
--- a/
cinelerra-5.1/cinelerra/vwindow.C
+++ b/
cinelerra-5.1/cinelerra/vwindow.C
@@
-328,29
+328,19
@@
void VWindow::update_position(int change_type,
{
//printf("VWindow::update_position %d\n", __LINE__);
//edl->dump();
{
//printf("VWindow::update_position %d\n", __LINE__);
//edl->dump();
- playback_engine->que->send_command(CURRENT_FRAME,
- change_type,
- edl,
- 1);
+ playback_engine->refresh_frame(change_type, edl);
double position = edl->local_session->get_selectionstart(1);
double position = edl->local_session->get_selectionstart(1);
- Asset *asset = edl->assets->first;
- if( asset && asset->tcstart ) {
- double rate = asset->video_data ? asset->frame_rate :
- asset->audio_data ? asset->sample_rate : 0;
- if( rate > 0 )
- position += asset->tcstart / rate;
- }
-
if(lock_window) gui->lock_window("VWindow::update_position");
gui->clock->update(position);
if(lock_window) gui->unlock_window();
}
}
if(lock_window) gui->lock_window("VWindow::update_position");
gui->clock->update(position);
if(lock_window) gui->unlock_window();
}
}
-
-
-
+void VWindow::stop_playback(int wait)
+{
+ playback_engine->stop_playback(wait);
+}
int VWindow::update_position(double position)
{
int VWindow::update_position(double position)
{
@@
-394,22
+384,12
@@
void VWindow::set_outpoint()
}
}
}
}
-void VWindow::clear_inpoint()
-{
- EDL *edl = get_edl();
- if(edl)
- {
- edl->local_session->unset_inpoint();
- gui->timebar->update(1);
- }
-}
-
-void VWindow::clear_outpoint()
+void VWindow::unset_inoutpoint()
{
EDL *edl = get_edl();
if(edl)
{
{
EDL *edl = get_edl();
if(edl)
{
- edl->
local_session->unset_
outpoint();
+ edl->
unset_in
outpoint();
gui->timebar->update(1);
}
}
gui->timebar->update(1);
}
}
@@
-433,10
+413,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();
}
}