projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
repair default keyframe load, tweak init default histogram threshold
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
splashgui.C
diff --git
a/cinelerra-5.1/cinelerra/splashgui.C
b/cinelerra-5.1/cinelerra/splashgui.C
index 3d9c451592ccfb6325ffe17d0411a3b5b5742cfc..e9e1840ad4d29477174fb5e7be2e861535906ba4 100644
(file)
--- a/
cinelerra-5.1/cinelerra/splashgui.C
+++ b/
cinelerra-5.1/cinelerra/splashgui.C
@@
-30,19
+30,8
@@
SplashGUI::SplashGUI(VFrame *bg, int x, int y)
SplashGUI::SplashGUI(VFrame *bg, int x, int y)
- : BC_Window(_(PROGRAM_NAME ": Loading"),
- x,
- y,
- bg->get_w(),
- bg->get_h(),
- -1,
- -1,
- 0,
- 0,
- 1,
- -1,
- "",
- 0)
+ : BC_Window(_(PROGRAM_NAME ": Loading"), x, y, bg->get_w(), bg->get_h(),
+ -1, -1, 0, 0, 1, -1, "", 0)
{
this->bg = bg;
}
{
this->bg = bg;
}
@@
-54,13
+43,21
@@
SplashGUI::~SplashGUI()
void SplashGUI::create_objects()
{
void SplashGUI::create_objects()
{
+ lock_window("SplashGUI::create_objects");
draw_vframe(bg, 0, 0);
flash();
show_window();
draw_vframe(bg, 0, 0);
flash();
show_window();
- add_subwindow(operation =
- new BC_Title(5,
+ operation = new BC_Title(5,
get_h() - get_text_height(MEDIUMFONT) - 5,
get_h() - get_text_height(MEDIUMFONT) - 5,
- _("Loading...")));
+ _("Loading..."), MEDIUMFONT, GREEN);
+ add_subwindow(operation);
+ unlock_window();
}
}
+void SplashGUI::update_status(const char *text)
+{
+ lock_window("SplashGUI::update_status");
+ operation->update(text);
+ unlock_window();
+}