projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sams cinfinity audio picons
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
mwindowgui.C
diff --git
a/cinelerra-5.1/cinelerra/mwindowgui.C
b/cinelerra-5.1/cinelerra/mwindowgui.C
index c21f83479be36845d1cf24900320a11401b41c7c..7587d46dee0fbbfa8e296eecd22c21335875d4de 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mwindowgui.C
+++ b/
cinelerra-5.1/cinelerra/mwindowgui.C
@@
-320,12
+320,8
@@
void MWindowGUI::create_objects()
if(debug) printf("MWindowGUI::create_objects %d\n", __LINE__);
add_subwindow(mainclock = new MainClock(mwindow,
if(debug) printf("MWindowGUI::create_objects %d\n", __LINE__);
add_subwindow(mainclock = new MainClock(mwindow,
- mwindow->theme->mclock_x,
- mwindow->theme->mclock_y,
+ mwindow->theme->mclock_x, mwindow->theme->mclock_y,
mwindow->theme->mclock_w));
mwindow->theme->mclock_w));
- mainclock->set_position_offset( (double)
- (mwindow->edl->session->get_frame_offset() /
- mwindow->edl->session->frame_rate));
if(debug) printf("MWindowGUI::create_objects %d\n", __LINE__);
mainclock->update(0);
if(debug) printf("MWindowGUI::create_objects %d\n", __LINE__);
mainclock->update(0);
@@
-920,16
+916,19
@@
int MWindowGUI::visible(int64_t x1, int64_t x2, int64_t view_x1, int64_t view_x2
void MWindowGUI::show_message(const char *message, int color)
{
void MWindowGUI::show_message(const char *message, int color)
{
- statusbar->s
et
_message(message, color);
+ statusbar->s
how
_message(message, color);
}
}
-void MWindowGUI::set_default_message(const char *message)
+
+void MWindowGUI::update_default_message()
{
{
- statusbar->
set_default_message(message
);
+ statusbar->
update_default_message(
);
}
}
+
void MWindowGUI::reset_default_message()
{
statusbar->reset_default_message();
}
void MWindowGUI::reset_default_message()
{
statusbar->reset_default_message();
}
+
void MWindowGUI::default_message()
{
statusbar->default_message();
void MWindowGUI::default_message()
{
statusbar->default_message();