#include "newfolder.h"
#include "preferences.h"
#include "proxy.h"
+#include "proxypopup.h"
#include "renderengine.h"
#include "samples.h"
#include "theme.h"
int AssetVIcon::get_vy()
{
BC_ListBox *lbox = picon->gui->asset_list;
- return lbox->get_item_y(picon) + lbox->get_title_h();
+ return lbox->get_item_y(picon);
}
void AssetVIcon::load_audio()
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");
open_render_engine(edl, 0);
render_video(0, gui->temp_picon);
close_render_engine();
- gui->lock_window("AssetPicon::create_objects 0");
icon_vframe = new VFrame(0,
-1, pixmap_w, pixmap_h, BC_RGB888, -1);
icon_vframe->transfer_from(gui->temp_picon);
pixmap_w = icon_vframe->get_w();
pixmap_h = icon_vframe->get_h();
}
+ gui->lock_window("AssetPicon::create_objects 0");
icon = new BC_Pixmap(gui, pixmap_w, pixmap_h);
icon->draw_vframe(icon_vframe,
0, 0, pixmap_w, pixmap_h, 0, 0);
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");
effectlist_menu = 0;
assetlist_menu = 0;
cliplist_menu = 0;
+ proxylist_menu = 0;
labellist_menu = 0;
folderlist_menu = 0;
temp_picon = 0;
vicon_audio = 0;
vicon_drawing = 1;
displayed_folder = AW_NO_FOLDER;
+ folder_lock = new Mutex("AWindowGUI::folder_lock");
}
AWindowGUI::~AWindowGUI()
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 vtransition_vframe; delete vtransition_icon;
delete aeffect_vframe; delete aeffect_icon;
delete veffect_vframe; delete veffect_icon;
+ delete folder_lock;
}
bool AWindowGUI::protected_pixmap(BC_Pixmap *icon)
plugin_icon(ladspa_vframe, ladspa_icon, "lad_picon", lad_picon_png);
plugin_icon(ff_aud_vframe, ff_aud_icon, "ff_audio", ff_audio_png);
plugin_icon(ff_vid_vframe, ff_vid_icon, "ff_video", ff_video_png);
-
+ folder_lock->lock("AWindowGUI::create_objects");
// Mandatory folders
folders.append(new AssetPicon(mwindow, this, AW_AEFFECT_FOLDER, 1));
folders.append(new AssetPicon(mwindow, this, AW_VEFFECT_FOLDER, 1));
folders.append(new AssetPicon(mwindow, this, AW_MEDIA_FOLDER, 1));
create_label_folder();
+ folder_lock->unlock();
mwindow->theme->get_awindow_sizes(this);
load_defaults(mwindow->defaults);
add_subwindow(asset_list = new AWindowAssets(mwindow, this, x1, y1, w1, h1));
vicon_thread = new VIconThread(asset_list);
+ int x0 = 0, y0 = asset_list->get_title_h();
+ vicon_thread->set_drawing_area(x0,y0, get_w(),get_h());
vicon_thread->start();
vicon_audio = new AssetVIconAudio(this);
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();
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();
{
if( !vicon_drawing ) return;
if( mwindow->edl->session->awindow_folder != AW_MEDIA_FOLDER ) return;
- if( mwindow->edl->session->assetlist_format != ASSETS_ICONS ) return;
- vicon_thread->start_drawing();
+ switch( mwindow->edl->session->assetlist_format ) {
+ case ASSETS_ICONS:
+ case ASSETS_ICONS_PACKED:
+ case ASSETS_ICON_LIST:
+ vicon_thread->start_drawing();
+ break;
+ default:
+ break;
+ }
}
void AWindowGUI::stop_vicon_drawing()
void AWindowRemovePluginGUI::create_objects()
{
+ lock_window("AWindowRemovePluginGUI::create_objects");
BC_Button *ok_button = new BC_OKButton(this);
add_subwindow(ok_button);
BC_Button *cancel_button = new BC_CancelButton(this);
0, 0, 1, 0, 0, LISTBOX_SINGLE, ICON_LEFT, 0);
add_subwindow(list);
show_window();
+ unlock_window();
}
int AWindowRemovePlugin::remove_plugin(PluginServer *plugin, ArrayList<BC_ListBoxItem*> &folder)
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();
void AWindowGUI::update_asset_list()
{
+ ArrayList<AssetPicon *> new_assets;
for( int i = 0; i < assets.total; i++ ) {
AssetPicon *picon = (AssetPicon*)assets.values[i];
picon->in_use = 0;
}
+ mwindow->gui->lock_window("AWindowGUI::update_asset_list");
// Synchronize EDL clips
for( int i=0; i<mwindow->edl->clips.size(); ++i ) {
int exists = 0;
if( !exists ) {
AssetPicon *picon = new AssetPicon(mwindow,
this, mwindow->edl->clips[i]);
- picon->create_objects();
- assets.append(picon);
+ new_assets.append(picon);
}
}
if( !exists ) {
AssetPicon *picon = new AssetPicon(mwindow,
this, current);
- picon->create_objects();
- assets.append(picon);
+ new_assets.append(picon);
}
}
- mwindow->gui->lock_window("AWindowGUI::update_asset_list");
- mwindow->gui->default_message();
- mwindow->gui->unlock_window();
-
// Synchronize nested EDLs
for( int i=0; i<mwindow->edl->nested_edls.size(); ++i ) {
int exists = 0;
if( !exists ) {
AssetPicon *picon = new AssetPicon(mwindow,
this, (Indexable*)nested_edl);
- picon->create_objects();
- assets.append(picon);
+ new_assets.append(picon);
}
}
+ mwindow->gui->unlock_window();
+
+ for( int i=0; i<new_assets.size(); ++i ) {
+ AssetPicon *picon = new_assets[i];
+ picon->create_objects();
+ assets.append(picon);
+ }
+
+ mwindow->gui->lock_window();
+ mwindow->gui->default_message();
+ mwindow->gui->unlock_window();
for( int i = assets.size() - 1; i >= 0; i-- ) {
AssetPicon *picon = (AssetPicon*)assets.get(i);
void AWindowGUI::sort_assets(int use_mtime)
{
+ folder_lock->lock("AWindowGUI::sort_assets");
switch( mwindow->edl->session->awindow_folder ) {
case AW_AEFFECT_FOLDER:
sort_picons(&aeffects);
break;
default:
sort_picons(&assets, use_mtime);
+ break;
}
// reset xyposition
asset_list->update_format(asset_list->get_format(), 0);
+ folder_lock->unlock();
update_assets();
}
void AWindowGUI::sort_folders()
{
+ folder_lock->lock("AWindowGUI::update_assets");
sort_picons(&folders);
folder_list->update_format(folder_list->get_format(), 0);
+ folder_lock->unlock();
update_assets();
}
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;
if( picon->edl )
dst[1].append(item2 = new BC_ListBoxItem(picon->edl->local_session->clip_notes));
else
- if( picon->label && picon->label->textstr )
+ if( picon->label )
dst[1].append(item2 = new BC_ListBoxItem(picon->label->textstr));
else if( picon->mtime ) {
char date_time[BCSTRLEN];
void AWindowGUI::update_assets()
{
stop_vicon_drawing();
+ folder_lock->lock("AWindowGUI::update_assets");
update_folder_list();
update_asset_list();
labellist.remove_all_objects();
if( displayed_folder != mwindow->edl->session->awindow_folder )
search_text->clear();
filter_displayed_assets();
+ folder_lock->unlock();
if( mwindow->edl->session->folderlist_format != folder_list->get_format() ) {
folder_list->update_format(mwindow->edl->session->folderlist_format, 0);
if( mwindow->edl->session->assetlist_format != asset_list->get_format() ) {
asset_list->update_format(mwindow->edl->session->assetlist_format, 0);
+ int x0 = 0;
+ int x1 = asset_list->get_w();
+ int y0 = asset_list->get_title_h();
+ int y1 = asset_list->get_h();
+ vicon_thread->set_drawing_area(x0,y0, x1,y1);
}
int asset_xposition = asset_list->get_xposition();
int asset_yposition = asset_list->get_yposition();
AWindowFolders::AWindowFolders(MWindow *mwindow, AWindowGUI *gui, int x, int y, int w, int h)
: BC_ListBox(x, y, w, h,
- mwindow->edl->session->folderlist_format == ASSETS_ICONS ?
+ mwindow->edl->session->folderlist_format == FOLDERS_ICONS ?
LISTBOX_ICONS : LISTBOX_TEXT,
&gui->folders, // Each column has an ArrayList of BC_ListBoxItems.
0, // Titles for columns. Set to 0 for no titles
AWindowAssets::AWindowAssets(MWindow *mwindow, AWindowGUI *gui, int x, int y, int w, int h)
- : BC_ListBox(x, y, w, h,
- (mwindow->edl->session->assetlist_format == ASSETS_ICONS && gui->allow_iconlisting ) ?
- LISTBOX_ICONS : LISTBOX_TEXT,
+ : BC_ListBox(x, y, w, h, !gui->allow_iconlisting ? LISTBOX_TEXT :
+ mwindow->edl->session->assetlist_format == ASSETS_ICONS ? LISTBOX_ICONS :
+ mwindow->edl->session->assetlist_format == ASSETS_ICONS_PACKED ? LISTBOX_ICONS_PACKED :
+ mwindow->edl->session->assetlist_format == ASSETS_ICON_LIST ? LISTBOX_ICON_LIST :
+ LISTBOX_TEXT,
&gui->assets, // Each column has an ArrayList of BC_ListBoxItems.
gui->asset_titles,// Titles for columns. Set to 0 for no titles
mwindow->edl->session->asset_columns, // width of each column
gui->cliplist_menu->update();
gui->cliplist_menu->activate_menu();
break;
- case AW_MEDIA_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;
{
AssetPicon *asset_picon = (AssetPicon *)get_selection(0, 0);
if( !asset_picon ) return 0;
+ Indexable *picon_idxbl = asset_picon->indexable;
+ EDL *picon_edl = asset_picon->edl;
+ int proxy = 0;
+ VWindow *vwindow = 0;
switch( mwindow->edl->session->awindow_folder ) {
case AW_AEFFECT_FOLDER:
case AW_VEFFECT_FOLDER:
case AW_ATRANSITION_FOLDER:
case AW_VTRANSITION_FOLDER: return 1;
+ case AW_PROXY_FOLDER:
+ proxy = 1; // fall thru
+ default:
+ if( mwindow->vwindows.size() > DEFAULT_VWINDOW )
+ vwindow = mwindow->vwindows.get(DEFAULT_VWINDOW);
+ break;
}
- VWindow *vwindow = mwindow->vwindows.size() > DEFAULT_VWINDOW ?
- mwindow->vwindows.get(DEFAULT_VWINDOW) : 0;
if( !vwindow || !vwindow->is_running() ) return 1;
+ if( proxy && picon_idxbl ) {
+ picon_edl = gui->collect_proxy(picon_idxbl);
+ picon_idxbl = 0;
+ }
- if( asset_picon->indexable )
- vwindow->change_source(asset_picon->indexable);
- else if( asset_picon->edl )
- vwindow->change_source(asset_picon->edl);
+ if( picon_idxbl ) vwindow->change_source(picon_idxbl);
+ else if( picon_edl ) vwindow->change_source(picon_edl);
return 1;
}
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();
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, "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;
#if 0
// plugin_dirs list from toplevel makefile include plugin_defs
-N_("ladspa")
N_("ffmpeg")
+N_("ladspa")
+N_("lv2")
N_("audio_tools")
N_("audio_transitions")
N_("blending")
gui->stop_vicon_drawing();
EDLSession *session = mwindow->edl->session;
- switch( session->assetlist_format ) {
- case ASSETS_TEXT:
- session->assetlist_format = ASSETS_ICONS;
- break;
- case ASSETS_ICONS:
- session->assetlist_format = ASSETS_TEXT;
- break;
+ if( mwindow->awindow->gui->allow_iconlisting ) {
+ switch( session->assetlist_format ) {
+ case ASSETS_TEXT:
+ session->assetlist_format = ASSETS_ICONS;
+ break;
+ case ASSETS_ICONS:
+ session->assetlist_format = ASSETS_ICONS_PACKED;
+ break;
+ case ASSETS_ICONS_PACKED:
+ session->assetlist_format = ASSETS_ICON_LIST;
+ break;
+ case ASSETS_ICON_LIST:
+ session->assetlist_format = ASSETS_TEXT;
+ break;
+ }
}
-
- gui->asset_list->update_format(session->assetlist_format, 1);
- if( !mwindow->awindow->gui->allow_iconlisting ) {
+ else
mwindow->edl->session->assetlist_format = ASSETS_TEXT;
- }
+ gui->asset_list->update_format(session->assetlist_format, 0);
+ int x0 = 0;
+ int x1 = gui->asset_list->get_w();
+ int y0 = gui->asset_list->get_title_h();
+ int y1 = gui->asset_list->get_h();
+ gui->vicon_thread->set_drawing_area(x0,y0, x1,y1);
+ gui->async_update_assets();
gui->start_vicon_drawing();
return 1;
}
void AWindowListFormat::update()
{
- set_text(mwindow->edl->session->assetlist_format == ASSETS_TEXT ?
- (char*)_("Display icons") : (char*)_("Display text"));
+ EDLSession *session = mwindow->edl->session;
+ const char *text = 0;
+ switch( session->assetlist_format ) {
+ case ASSETS_TEXT:
+ text = _("Display icons");
+ break;
+ case ASSETS_ICONS:
+ text = _("Display icons packed");
+ break;
+ case ASSETS_ICONS_PACKED:
+ text = _("Display icon list");
+ break;
+ case ASSETS_ICON_LIST:
+ text = _("Display text");
+ break;
+ }
+ set_text(text);
}
AWindowListSort::AWindowListSort(MWindow *mwindow, AWindowGUI *gui)
projects / goodguy / history.git / blobdiff