projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add waveform audio icons, clear vwdw on change_source
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
vwindowgui.C
diff --git
a/cinelerra-5.1/cinelerra/vwindowgui.C
b/cinelerra-5.1/cinelerra/vwindowgui.C
index f5fef954182d7565d35a78c40b13d24ada7e7584..a94e176750392f3efdf8b29849b546095eaa4536 100644
(file)
--- a/
cinelerra-5.1/cinelerra/vwindowgui.C
+++ b/
cinelerra-5.1/cinelerra/vwindowgui.C
@@
-104,6
+104,7
@@
void VWindowGUI::change_source(EDL *edl, const char *title)
sprintf(string, _(PROGRAM_NAME ": Viewer"));
lock_window("VWindowGUI::change_source");
sprintf(string, _(PROGRAM_NAME ": Viewer"));
lock_window("VWindowGUI::change_source");
+ canvas->clear();
timebar->update(0);
set_title(string);
unlock_window();
timebar->update(0);
set_title(string);
unlock_window();
@@
-640,15
+641,11
@@
void VWindowEditing::set_outpoint()
vwindow->set_outpoint();
}
vwindow->set_outpoint();
}
-void VWindowEditing::
clear_in
point()
+void VWindowEditing::
unset_inout
point()
{
{
- vwindow->
clear_in
point();
+ vwindow->
unset_inout
point();
}
}
-void VWindowEditing::clear_outpoint()
-{
- vwindow->clear_outpoint();
-}
void VWindowEditing::to_clip()
{
void VWindowEditing::to_clip()
{
@@
-879,7
+876,7
@@
void VWindowGUI::update_points()
//printf("VWindowGUI::update_points 2\n");
long pixel = (long)((double)edl->local_session->in_point /
//printf("VWindowGUI::update_points 2\n");
long pixel = (long)((double)edl->local_session->in_point /
- edl->tracks->total_
playable_
length() *
+ edl->tracks->total_length() *
(mwindow->theme->vtimebar_w -
2 *
mwindow->theme->in_point[0]->get_w())) +
(mwindow->theme->vtimebar_w -
2 *
mwindow->theme->in_point[0]->get_w())) +
@@
-931,7
+928,7
@@
void VWindowGUI::update_points()
//printf("VWindowGUI::update_points 10\n");
pixel = (long)((double)edl->local_session->out_point /
//printf("VWindowGUI::update_points 10\n");
pixel = (long)((double)edl->local_session->out_point /
- (edl->tracks->total_
playable_
length() + 0.5) *
+ (edl->tracks->total_length() + 0.5) *
(mwindow->theme->vtimebar_w -
2 *
mwindow->theme->in_point[0]->get_w())) +
(mwindow->theme->vtimebar_w -
2 *
mwindow->theme->in_point[0]->get_w())) +