projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix for missing lv2 config update
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
awindowgui.C
diff --git
a/cinelerra-5.1/cinelerra/awindowgui.C
b/cinelerra-5.1/cinelerra/awindowgui.C
index 0ed6b1ce0fd3da31afd2e4b1ada67f50711be173..7e97656929ae6787fd8e37d0c8d13de183502c8d 100644
(file)
--- a/
cinelerra-5.1/cinelerra/awindowgui.C
+++ b/
cinelerra-5.1/cinelerra/awindowgui.C
@@
-57,6
+57,7
@@
#include "newfolder.h"
#include "preferences.h"
#include "proxy.h"
#include "newfolder.h"
#include "preferences.h"
#include "proxy.h"
+#include "proxypopup.h"
#include "renderengine.h"
#include "samples.h"
#include "theme.h"
#include "renderengine.h"
#include "samples.h"
#include "theme.h"
@@
-551,6
+552,7
@@
void AssetPicon::create_objects()
pixmap_w = pixmap_h * 16/9;
icon_vframe = new VFrame(0,
-1, pixmap_w, pixmap_h, BC_RGB888, -1);
pixmap_w = pixmap_h * 16/9;
icon_vframe = new VFrame(0,
-1, pixmap_w, pixmap_h, BC_RGB888, -1);
+ icon_vframe->clear_frame();
{ char string[BCTEXTLEN];
sprintf(string, _("Reading %s"), name);
mwindow->gui->lock_window("AssetPicon::create_objects 3");
{ char string[BCTEXTLEN];
sprintf(string, _("Reading %s"), name);
mwindow->gui->lock_window("AssetPicon::create_objects 3");
@@
-683,6
+685,7
@@
void AssetPicon::create_objects()
pixmap_w = pixmap_h * 16/9;
icon_vframe = new VFrame(0,
-1, pixmap_w, pixmap_h, BC_RGB888, -1);
pixmap_w = pixmap_h * 16/9;
icon_vframe = new VFrame(0,
-1, pixmap_w, pixmap_h, BC_RGB888, -1);
+ icon_vframe->clear_frame();
char string[BCTEXTLEN];
sprintf(string, _("Rendering %s"), name);
mwindow->gui->lock_window("AssetPicon::create_objects 3");
char string[BCTEXTLEN];
sprintf(string, _("Rendering %s"), name);
mwindow->gui->lock_window("AssetPicon::create_objects 3");
@@
-833,6
+836,7
@@
AWindowGUI::AWindowGUI(MWindow *mwindow, AWindow *awindow)
effectlist_menu = 0;
assetlist_menu = 0;
cliplist_menu = 0;
effectlist_menu = 0;
assetlist_menu = 0;
cliplist_menu = 0;
+ proxylist_menu = 0;
labellist_menu = 0;
folderlist_menu = 0;
temp_picon = 0;
labellist_menu = 0;
folderlist_menu = 0;
temp_picon = 0;
@@
-860,14
+864,6
@@
AWindowGUI::~AWindowGUI()
delete vicon_audio;
delete newfolder_thread;
delete vicon_audio;
delete newfolder_thread;
- delete asset_menu;
- delete clip_menu;
- delete label_menu;
- delete effectlist_menu;
- delete assetlist_menu;
- delete cliplist_menu;
- delete labellist_menu;
- delete folderlist_menu;
delete search_text;
delete temp_picon;
delete remove_plugin;
delete search_text;
delete temp_picon;
delete remove_plugin;
@@
-1060,6
+1056,8
@@
void AWindowGUI::create_objects()
clip_menu->create_objects();
add_subwindow(label_menu = new LabelPopup(mwindow, this));
label_menu->create_objects();
clip_menu->create_objects();
add_subwindow(label_menu = new LabelPopup(mwindow, this));
label_menu->create_objects();
+ add_subwindow(proxy_menu = new ProxyPopup(mwindow, this));
+ proxy_menu->create_objects();
add_subwindow(effectlist_menu = new EffectListMenu(mwindow, this));
effectlist_menu->create_objects();
add_subwindow(effectlist_menu = new EffectListMenu(mwindow, this));
effectlist_menu->create_objects();
@@
-1069,6
+1067,8
@@
void AWindowGUI::create_objects()
cliplist_menu->create_objects();
add_subwindow(labellist_menu = new LabelListMenu(mwindow, this));
labellist_menu->create_objects();
cliplist_menu->create_objects();
add_subwindow(labellist_menu = new LabelListMenu(mwindow, this));
labellist_menu->create_objects();
+ add_subwindow(proxylist_menu = new ProxyListMenu(mwindow, this));
+ proxylist_menu->create_objects();
add_subwindow(folderlist_menu = new FolderListMenu(mwindow, this));
folderlist_menu->create_objects();
add_subwindow(folderlist_menu = new FolderListMenu(mwindow, this));
folderlist_menu->create_objects();
@@
-1310,6
+1310,12
@@
int AWindowGUI::keypress_event()
return 1;
}
break;
return 1;
}
break;
+ case 'o':
+ if( !ctrl_down() && !shift_down() ) {
+ assetlist_menu->load_file->handle_event();
+ return 1;
+ }
+ break;
case DELETE:
if( shift_down() ) {
PluginServer* plugin = selected_plugin();
case DELETE:
if( shift_down() ) {
PluginServer* plugin = selected_plugin();
@@
-1584,6
+1590,7
@@
EDL *AWindowGUI::collect_proxy(Indexable *indexable)
EDL *proxy_edl = new EDL(mwindow->edl);
proxy_edl->create_objects();
FileSystem fs; fs.extract_name(path, proxy_asset->path);
EDL *proxy_edl = new EDL(mwindow->edl);
proxy_edl->create_objects();
FileSystem fs; fs.extract_name(path, proxy_asset->path);
+ proxy_edl->set_path(path);
strcpy(proxy_edl->local_session->clip_title, path);
strcpy(proxy_edl->local_session->clip_notes, _("Proxy clip"));
proxy_edl->session->video_tracks = proxy_asset->layers;
strcpy(proxy_edl->local_session->clip_title, path);
strcpy(proxy_edl->local_session->clip_notes, _("Proxy clip"));
proxy_edl->session->video_tracks = proxy_asset->layers;
@@
-1999,8
+2006,11
@@
int AWindowAssets::button_press_event()
gui->cliplist_menu->update();
gui->cliplist_menu->activate_menu();
break;
gui->cliplist_menu->update();
gui->cliplist_menu->activate_menu();
break;
- case AW_MEDIA_FOLDER:
case AW_PROXY_FOLDER:
case AW_PROXY_FOLDER:
+ gui->proxylist_menu->update();
+ gui->proxylist_menu->activate_menu();
+ break;
+ case AW_MEDIA_FOLDER:
gui->assetlist_menu->update_titles(folder==AW_MEDIA_FOLDER);
gui->assetlist_menu->activate_menu();
break;
gui->assetlist_menu->update_titles(folder==AW_MEDIA_FOLDER);
gui->assetlist_menu->activate_menu();
break;
@@
-2057,6
+2067,11
@@
int AWindowAssets::selection_changed()
gui->clip_menu->update();
gui->clip_menu->activate_menu();
break;
gui->clip_menu->update();
gui->clip_menu->activate_menu();
break;
+ case AW_PROXY_FOLDER:
+ if( !item->indexable && !item->edl ) break;
+ gui->proxy_menu->update();
+ gui->proxy_menu->activate_menu();
+ break;
default:
if( !item->indexable && !item->edl ) break;
gui->asset_menu->update();
default:
if( !item->indexable && !item->edl ) break;
gui->asset_menu->update();
@@
-2452,10
+2467,14
@@
AddTools::AddTools(MWindow *mwindow, AWindowGUI *gui, int x, int y, const char *
void AddTools::create_objects()
{
uint64_t vis = 0;
void AddTools::create_objects()
{
uint64_t vis = 0;
- add_item(new AddPluginItem(this, "ladspa", PLUGIN_LADSPA_ID));
- vis |= 1 << PLUGIN_LADSPA_ID;
add_item(new AddPluginItem(this, "ffmpeg", PLUGIN_FFMPEG_ID));
vis |= 1 << PLUGIN_FFMPEG_ID;
add_item(new AddPluginItem(this, "ffmpeg", PLUGIN_FFMPEG_ID));
vis |= 1 << PLUGIN_FFMPEG_ID;
+ add_item(new AddPluginItem(this, "ladspa", PLUGIN_LADSPA_ID));
+ vis |= 1 << PLUGIN_LADSPA_ID;
+#ifdef HAVE_LV2
+ add_item(new AddPluginItem(this, "lv2", PLUGIN_LV2_ID));
+ vis |= 1 << PLUGIN_LV2_ID;
+#endif
for( int i=0; i<MWindow::plugindb->size(); ++i ) {
PluginServer *plugin = MWindow::plugindb->get(i);
if( !plugin->audio && !plugin->video ) continue;
for( int i=0; i<MWindow::plugindb->size(); ++i ) {
PluginServer *plugin = MWindow::plugindb->get(i);
if( !plugin->audio && !plugin->video ) continue;
@@
-2474,8
+2493,9
@@
void AddTools::create_objects()
#if 0
// plugin_dirs list from toplevel makefile include plugin_defs
#if 0
// plugin_dirs list from toplevel makefile include plugin_defs
-N_("ladspa")
N_("ffmpeg")
N_("ffmpeg")
+N_("ladspa")
+N_("lv2")
N_("audio_tools")
N_("audio_transitions")
N_("blending")
N_("audio_tools")
N_("audio_transitions")
N_("blending")