projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clean up bclistbox, listbox shift drag fix, plugin info
[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..45dacc0b8496f4425b782f2b560ac67b7d189a94 100644
(file)
--- a/
cinelerra-5.1/cinelerra/vwindow.C
+++ b/
cinelerra-5.1/cinelerra/vwindow.C
@@
-334,14
+334,6
@@
void VWindow::update_position(int change_type,
1);
double position = edl->local_session->get_selectionstart(1);
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();
@@
-433,10
+425,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();
}
}