projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
upgrade to ffmpeg-2.8
[goodguy/history.git]
/
cinelerra-5.0
/
cinelerra
/
keyframegui.C
diff --git
a/cinelerra-5.0/cinelerra/keyframegui.C
b/cinelerra-5.0/cinelerra/keyframegui.C
index d2aa5f1e77d0ef34fe268b0e1c5550fa95582981..ff14ae50849ca23109f9b5e98f4a7af29df10697 100644
(file)
--- a/
cinelerra-5.0/cinelerra/keyframegui.C
+++ b/
cinelerra-5.0/cinelerra/keyframegui.C
@@
-50,8
+50,8
@@
KeyFrameThread::KeyFrameThread(MWindow *mwindow)
keyframe_data = new ArrayList<BC_ListBoxItem*>[KEYFRAME_COLUMNS];
plugin_title[0] = 0;
window_title[0] = 0;
keyframe_data = new ArrayList<BC_ListBoxItem*>[KEYFRAME_COLUMNS];
plugin_title[0] = 0;
window_title[0] = 0;
- column_titles[0] = (char*)
"Parameter"
;
- column_titles[1] = (char*)
"Value"
;
+ column_titles[0] = (char*)
_("Parameter")
;
+ column_titles[1] = (char*)
_("Value")
;
column_width[0] = 0;
column_width[1] = 0;
presets_data = new ArrayList<BC_ListBoxItem*>;
column_width[0] = 0;
column_width[1] = 0;
presets_data = new ArrayList<BC_ListBoxItem*>;
@@
-60,6
+60,7
@@
KeyFrameThread::KeyFrameThread(MWindow *mwindow)
KeyFrameThread::~KeyFrameThread()
{
KeyFrameThread::~KeyFrameThread()
{
+ close_window();
for(int i = 0; i < KEYFRAME_COLUMNS; i++)
keyframe_data[i].remove_all_objects();
delete [] keyframe_data;
for(int i = 0; i < KEYFRAME_COLUMNS; i++)
keyframe_data[i].remove_all_objects();
delete [] keyframe_data;
@@
-121,7
+122,7
@@
void KeyFrameThread::update_values()
keyframe_data[0].append(new BC_ListBoxItem(hash.get_key(i)));
keyframe_data[1].append(new BC_ListBoxItem(hash.get_value(i)));
}
keyframe_data[0].append(new BC_ListBoxItem(hash.get_key(i)));
keyframe_data[1].append(new BC_ListBoxItem(hash.get_value(i)));
}
- keyframe_data[0].append(new BC_ListBoxItem((char*)
"TEXT"
));
+ keyframe_data[0].append(new BC_ListBoxItem((char*)
_("TEXT")
));
keyframe_data[1].append(new BC_ListBoxItem(text));
delete [] text;
keyframe_data[1].append(new BC_ListBoxItem(text));
delete [] text;
@@
-149,7
+150,7
@@
void KeyFrameThread::start_window(Plugin *plugin, KeyFrame *keyframe)
this->keyframe = keyframe;
this->plugin = plugin;
plugin->calculate_title(plugin_title, 0);
this->keyframe = keyframe;
this->plugin = plugin;
plugin->calculate_title(plugin_title, 0);
- sprintf(window_title,
PROGRAM_NAME ": %s Keyframe"
, plugin_title);
+ sprintf(window_title,
_(PROGRAM_NAME ": %s Keyframe")
, plugin_title);
presets_db->load();
calculate_preset_list();
presets_db->load();
calculate_preset_list();
@@
-206,18
+207,6
@@
void KeyFrameThread::handle_close_event(int result)
keyframe = 0;
}
keyframe = 0;
}
-void KeyFrameThread::close_window()
-{
- lock_window("KeyFrameThread::close_window");
- if(get_gui())
- {
- get_gui()->lock_window("KeyFrameThread::close_window");
- get_gui()->set_done(1);
- get_gui()->unlock_window();
- }
- unlock_window();
-}
-
void KeyFrameThread::calculate_preset_list()
void KeyFrameThread::calculate_preset_list()