projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yet another proxy ref fix
[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 78cbb2a149f0f939e8f7c653f3f5f8179b4e4bcb..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);
@@
-382,12
+378,6
@@
void MWindowGUI::redraw_time_dependancies()
mainclock->update(mwindow->edl->local_session->get_selectionstart(1));
}
mainclock->update(mwindow->edl->local_session->get_selectionstart(1));
}
-int MWindowGUI::cursor_enter_event()
-{
- reset_default_message();
- return 0;
-}
-
int MWindowGUI::focus_in_event()
{
for(int i = 0; i < TOTAL_PANES; i++)
int MWindowGUI::focus_in_event()
{
for(int i = 0; i < TOTAL_PANES; i++)
@@
-926,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();
@@
-2289,9
+2282,7
@@
FFMpegToggle::FFMpegToggle(MWindow *mwindow, MButtons *mbuttons, int x, int y)
{
this->mwindow = mwindow;
this->mbuttons = mbuttons;
{
this->mwindow = mwindow;
this->mbuttons = mbuttons;
- set_tooltip(!get_value() ?
- _("Currently: Try FFMpeg last\n Click to: Try FFMpeg first") :
- _("Currently: Try FFMpeg first\n Click to: Try FFMpeg last"));
+ set_tooltip(get_value() ? FFMPEG_EARLY_TIP : FFMPEG_LATE_TIP);
}
FFMpegToggle::~FFMpegToggle()
}
FFMpegToggle::~FFMpegToggle()
@@
-2301,12
+2292,10
@@
FFMpegToggle::~FFMpegToggle()
int FFMpegToggle::handle_event()
{
int ffmpeg_early_probe = get_value();
int FFMpegToggle::handle_event()
{
int ffmpeg_early_probe = get_value();
- set_tooltip(!ffmpeg_early_probe ?
- _("Currently: Try FFMpeg last\n Click to: Try FFMpeg first") :
- _("Currently: Try FFMpeg first\n Click to: Try FFMpeg last"));
+ set_tooltip(ffmpeg_early_probe ? FFMPEG_EARLY_TIP : FFMPEG_LATE_TIP);
mwindow->preferences->set_file_probe_armed("FFMPEG_Early", ffmpeg_early_probe);
mwindow->preferences->set_file_probe_armed("FFMPEG_Late", !ffmpeg_early_probe);
mwindow->preferences->set_file_probe_armed("FFMPEG_Early", ffmpeg_early_probe);
mwindow->preferences->set_file_probe_armed("FFMPEG_Late", !ffmpeg_early_probe);
-
+
mwindow->show_warning(&mwindow->preferences->warn_indexes,
_("Changing the base codecs may require rebuilding indexes."));
return 1;
mwindow->show_warning(&mwindow->preferences->warn_indexes,
_("Changing the base codecs may require rebuilding indexes."));
return 1;