add resource wdw folder expanders, fix plugin close deadlock detect
[goodguy/history.git] / cinelerra-5.1 / cinelerra / awindowgui.C
index 688869130b686fecd21c32db35dc2897ac9d2119..218523974a544449663271b79888c6afc7163c59 100644 (file)
@@ -19,6 +19,7 @@
  *
  */
 
+#include "arender.h"
 #include "asset.h"
 #include "assetedit.h"
 #include "assetpopup.h"
 #include "bccmodels.h"
 #include "bcsignals.h"
 #include "bchash.h"
+#include "binfolder.h"
 #include "cache.h"
 #include "cstrdup.h"
 #include "clip.h"
+#include "clipedls.h"
 #include "clippopup.h"
 #include "cursors.h"
 #include "cwindowgui.h"
 #include "mainsession.h"
 #include "mwindowgui.h"
 #include "mwindow.h"
-#include "nestededls.h"
-#include "newfolder.h"
 #include "preferences.h"
+#include "proxy.h"
+#include "proxypopup.h"
+#include "renderengine.h"
 #include "samples.h"
 #include "theme.h"
+#include "tracks.h"
+#include "transportque.h"
 #include "vframe.h"
 #include "vicon.h"
+#include "vrender.h"
 #include "vwindowgui.h"
 #include "vwindow.h"
 
@@ -127,6 +134,15 @@ VFrame *AssetVIcon::frame()
                temp->draw_line(x,0, x,vh);
                return temp;
        }
+       int ww = picon->gui->vicon_thread->view_w;
+       int hh = picon->gui->vicon_thread->view_h;
+       if( !asset->video_data ) {
+               if( !temp ) {
+                       temp = new VFrame(0, -1, ww, hh, BC_RGB888, -1);
+                       temp->clear_frame();
+               }
+               return temp;
+       }
        if( seq_no >= images.size() ) {
                MWindow *mwindow = picon->mwindow;
                File *file = mwindow->video_cache->check_out(asset, mwindow->edl, 1);
@@ -136,9 +152,11 @@ VFrame *AssetVIcon::frame()
                }
                if( !temp )
                        temp = new VFrame(0, -1, asset->width, asset->height, BC_RGB888, -1);
-               int ww = picon->gui->vicon_thread->view_w;
-               int hh = picon->gui->vicon_thread->view_h;
                while( seq_no >= images.size() ) {
+                       mwindow->video_cache->check_in(asset);
+                       Thread::yield();
+                       file = mwindow->video_cache->check_out(asset, mwindow->edl, 0);
+                       if( !file ) { usleep(1000);  continue; }
                        file->set_layer(0);
                        int64_t pos = images.size() / picon->gui->vicon_thread->refresh_rate * frame_rate;
                        file->set_video_position(pos,0);
@@ -159,12 +177,12 @@ int64_t AssetVIcon::set_seq_no(int64_t no)
 int AssetVIcon::get_vx()
 {
        BC_ListBox *lbox = picon->gui->asset_list;
-       return lbox->get_item_x(picon);
+       return lbox->get_icon_x(picon);
 }
 int AssetVIcon::get_vy()
 {
        BC_ListBox *lbox = picon->gui->asset_list;
-       return lbox->get_item_y(picon) + lbox->get_title_h();
+       return lbox->get_icon_y(picon);
 }
 
 void AssetVIcon::load_audio()
@@ -282,9 +300,51 @@ void AssetVIcon::stop_audio()
        playing_audio = 0;
 }
 
+
+AWindowFolderItem::AWindowFolderItem()
+ : BC_ListBoxItem()
+{
+       parent = 0;
+}
+
+AWindowFolderItem::AWindowFolderItem(const char *text, int color)
+ : BC_ListBoxItem(text, color)
+{
+       parent = 0;
+}
+
+AWindowFolderItem::AWindowFolderItem(const char *text, BC_Pixmap *icon, int color)
+ : BC_ListBoxItem(text, icon, color)
+{
+       parent = 0;
+}
+
+AssetPicon *AWindowFolderItem::get_picon()
+{
+       AWindowFolderItem *item = this;
+       while( item->parent ) { item = (AWindowFolderItem*)item->parent; }
+       return (AssetPicon*)item;
+}
+
+int AWindowFolderSubItems::matches(const char *text)
+{
+       int i = names.size();
+       while( --i >= 0 && strcmp(names[i], text) );
+       if( i < 0 ) {
+               ArrayList<BC_ListBoxItem *> *sublist = get_sublist();
+               i = sublist ? sublist->size() : 0;
+               while( --i >= 0 ) {
+                       AWindowFolderSubItems *item = (AWindowFolderSubItems *)sublist->get(i);
+                       if( item->matches(text) ) break;
+               }
+       }
+       return i >= 0 ? 1 : 0;
+}
+
+
 AssetPicon::AssetPicon(MWindow *mwindow,
        AWindowGUI *gui, Indexable *indexable)
- : BC_ListBoxItem()
+ : AWindowFolderItem()
 {
        reset();
        this->mwindow = mwindow;
@@ -296,7 +356,7 @@ AssetPicon::AssetPicon(MWindow *mwindow,
 
 AssetPicon::AssetPicon(MWindow *mwindow,
        AWindowGUI *gui, EDL *edl)
- : BC_ListBoxItem()
+ : AWindowFolderItem()
 {
        reset();
        this->mwindow = mwindow;
@@ -308,9 +368,9 @@ AssetPicon::AssetPicon(MWindow *mwindow,
 
 AssetPicon::AssetPicon(MWindow *mwindow,
        AWindowGUI *gui, int folder, int persist)
- : BC_ListBoxItem(_(AWindowGUI::folder_names[folder]),
+ : AWindowFolderItem(_(AWindowGUI::folder_names[folder]),
        folder>=0 && folder<AWINDOW_FOLDERS ?
-               gui->folder_icons[folder]: gui->folder_icon)
+               gui->folder_icons[folder] : gui->folder_icon)
 {
        reset();
        foldernum = folder;
@@ -319,9 +379,20 @@ AssetPicon::AssetPicon(MWindow *mwindow,
        persistent = persist;
 }
 
+AssetPicon::AssetPicon(MWindow *mwindow,
+       AWindowGUI *gui, int folder, const char *title)
+ : AWindowFolderItem(title, gui->folder_icon)
+{
+       reset();
+       foldernum = folder;
+       this->mwindow = mwindow;
+       this->gui = gui;
+       persistent = 0;
+}
+
 AssetPicon::AssetPicon(MWindow *mwindow,
        AWindowGUI *gui, PluginServer *plugin)
- : BC_ListBoxItem()
+ : AWindowFolderItem()
 {
        reset();
        this->mwindow = mwindow;
@@ -331,7 +402,7 @@ AssetPicon::AssetPicon(MWindow *mwindow,
 
 AssetPicon::AssetPicon(MWindow *mwindow,
        AWindowGUI *gui, Label *label)
- : BC_ListBoxItem()
+ : AWindowFolderItem()
 {
        reset();
        this->mwindow = mwindow;
@@ -346,6 +417,7 @@ AssetPicon::~AssetPicon()
 {
        if( vicon )
                gui->vicon_thread->del_vicon(vicon);
+       delete vicon_frame;
        if( indexable ) indexable->remove_user();
        if( edl ) edl->remove_user();
        if( icon && !gui->protected_pixmap(icon) ) {
@@ -406,16 +478,47 @@ void AssetPicon::reset()
        label = 0;
        indexable = 0;
        edl = 0;
+       parent = 0;
+       sub_items = 0;
        foldernum = AW_NO_FOLDER;
+       sort_key = -1;
        icon = 0;
        icon_vframe = 0;
        vicon = 0;
+       vicon_frame = 0;
        in_use = 1;
-       mtime = 0;
+       comments_time = 0;
        id = 0;
        persistent = 0;
 }
 
+void AssetPicon::open_render_engine(EDL *edl, int is_audio)
+{
+       TransportCommand command;
+       command.command = is_audio ? NORMAL_FWD : CURRENT_FRAME;
+       command.get_edl()->copy_all(edl);
+       command.change_type = CHANGE_ALL;
+       command.realtime = 0;
+       render_engine = new RenderEngine(0, mwindow->preferences, 0, 0);
+       render_engine->set_vcache(mwindow->video_cache);
+       render_engine->set_acache(mwindow->audio_cache);
+       render_engine->arm_command(&command);
+}
+void AssetPicon::close_render_engine()
+{
+       delete render_engine;  render_engine = 0;
+}
+void AssetPicon::render_video(int64_t pos, VFrame *vfrm)
+{
+       if( !render_engine || !render_engine->vrender ) return;
+       render_engine->vrender->process_buffer(vfrm, pos, 0);
+}
+void AssetPicon::render_audio(int64_t pos, Samples **samples, int len)
+{
+       if( !render_engine || !render_engine->arender ) return;
+       render_engine->arender->process_buffer(samples, len, pos);
+}
+
 void AssetPicon::create_objects()
 {
        FileSystem fs;
@@ -428,6 +531,10 @@ void AssetPicon::create_objects()
                fs.extract_name(name, indexable->path);
                set_text(name);
        }
+       else if( edl ) {
+               set_text(strcpy(name, edl->local_session->clip_title));
+               set_text(name);
+       }
 
        if( indexable && indexable->is_asset ) {
                Asset *asset = (Asset*)indexable;
@@ -514,6 +621,7 @@ void AssetPicon::create_objects()
                                        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");
@@ -566,7 +674,7 @@ void AssetPicon::create_objects()
 
                }
                struct stat st;
-               mtime = !stat(asset->path, &st) ? st.st_mtime : 0;
+               comments_time = !stat(asset->path, &st) ? st.st_mtime : 0;
        }
        else
        if( indexable && !indexable->is_asset ) {
@@ -575,9 +683,119 @@ void AssetPicon::create_objects()
        }
        else
        if( edl ) {
-               set_text(strcpy(name, edl->local_session->clip_title));
-               icon = gui->clip_icon;
-               icon_vframe = gui->clip_vframe;
+               if( edl->tracks->playable_video_tracks() ) {
+                       if( mwindow->preferences->use_thumbnails ) {
+                               gui->unlock_window();
+                               char clip_icon_path[BCTEXTLEN];
+                               char *clip_icon = edl->local_session->clip_icon;
+                               if( clip_icon[0] ) {
+                                       snprintf(clip_icon_path, sizeof(clip_icon_path),
+                                               "%s/%s", File::get_config_path(), clip_icon);
+                                       icon_vframe = VFramePng::vframe_png(clip_icon_path);
+                               }
+                               if( !icon_vframe ) {
+//printf("render clip: %s\n", name);
+                                       int edl_h = edl->get_h(), edl_w = edl->get_w();
+                                       int height = edl_h > 0 ? edl_h : 1;
+                                       int width = edl_w > 0 ? edl_w : 1;
+                                       int color_model = edl->session->color_model;
+                                       pixmap_w = pixmap_h * width / height;
+
+                                       if( gui->temp_picon &&
+                                           (gui->temp_picon->get_color_model() != color_model ||
+                                            gui->temp_picon->get_w() != width ||
+                                            gui->temp_picon->get_h() != height) ) {
+                                               delete gui->temp_picon;  gui->temp_picon = 0;
+                                       }
+
+                                       if( !gui->temp_picon ) {
+                                               gui->temp_picon = new VFrame(0, -1,
+                                                       width, height, color_model, -1);
+                                       }
+                                       char string[BCTEXTLEN];
+                                       sprintf(string, _("Rendering %s"), name);
+                                       mwindow->gui->lock_window("AssetPicon::create_objects");
+                                       mwindow->gui->show_message(string);
+                                       mwindow->gui->unlock_window();
+                                       open_render_engine(edl, 0);
+                                       render_video(0, gui->temp_picon);
+                                       close_render_engine();
+                                       icon_vframe = new VFrame(0,
+                                               -1, pixmap_w, pixmap_h, BC_RGB888, -1);
+                                       icon_vframe->transfer_from(gui->temp_picon);
+                                       if( clip_icon[0] ) icon_vframe->write_png(clip_icon_path);
+                               }
+                               else {
+                                       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);
+                       }
+                       else {
+                               icon = gui->clip_icon;
+                               icon_vframe = gui->clip_vframe;
+                       }
+               }
+               else
+               if( edl->tracks->playable_audio_tracks() ) {
+                       if( mwindow->preferences->use_thumbnails ) {
+                               gui->unlock_window();
+                               char clip_icon_path[BCTEXTLEN];
+                               char *clip_icon = edl->local_session->clip_icon;
+                               if( clip_icon[0] ) {
+                                       snprintf(clip_icon_path, sizeof(clip_icon_path),
+                                               "%s/%s", File::get_config_path(), clip_icon);
+                                       icon_vframe = VFramePng::vframe_png(clip_icon_path);
+                               }
+                               if( !icon_vframe ) {
+                                       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");
+                                       mwindow->gui->show_message(string);
+                                       mwindow->gui->unlock_window();
+                                       int sample_rate = edl->get_sample_rate();
+                                       int channels = edl->get_audio_channels();
+                                       if( channels > 2 ) channels = 2;
+                                       int64_t audio_samples = edl->get_audio_samples();
+                                       double duration = (double)audio_samples / sample_rate;
+                                       draw_hue_bar(icon_vframe, duration);
+                                       Samples *samples[MAX_CHANNELS];
+                                       int bfrsz = sample_rate;
+                                       for( int i=0; i<MAX_CHANNELS; ++i )
+                                               samples[i] = i<channels ? new Samples(bfrsz) : 0;
+                                       open_render_engine(edl, 1);
+                                       render_audio(0, samples, bfrsz);
+                                       close_render_engine();
+                                       gui->lock_window("AssetPicon::create_objects 4");
+                                       static int line_colors[2] = { GREEN, YELLOW };
+                                       static int base_colors[2] = { RED, PINK };
+                                       for( int i=channels; --i>=0; ) {
+                                               draw_wave(icon_vframe, samples[i]->get_data(), bfrsz,
+                                                       base_colors[i], line_colors[i]);
+                                       }
+                                       for( int i=0; i<channels; ++i ) delete samples[i];
+                                       if( clip_icon[0] ) icon_vframe->write_png(clip_icon_path);
+                               }
+                               else {
+                                       pixmap_w = icon_vframe->get_w();
+                                       pixmap_h = icon_vframe->get_h();
+                               }
+                               icon = new BC_Pixmap(gui, pixmap_w, pixmap_h);
+                               icon->draw_vframe(icon_vframe,
+                                       0, 0, pixmap_w, pixmap_h, 0, 0);
+                       }
+                       else {
+                               icon = gui->clip_icon;
+                               icon_vframe = gui->clip_vframe;
+                       }
+               }
        }
        else
        if( plugin ) {
@@ -682,11 +900,11 @@ AWindowGUI::AWindowGUI(MWindow *mwindow, AWindow *awindow)
        veffect_vframe = 0;             veffect_icon = 0;
 
        plugin_visibility = ((uint64_t)1<<(8*sizeof(uint64_t)-1))-1;
-       newfolder_thread = 0;
        asset_menu = 0;
        effectlist_menu = 0;
        assetlist_menu = 0;
        cliplist_menu = 0;
+       proxylist_menu = 0;
        labellist_menu = 0;
        folderlist_menu = 0;
        temp_picon = 0;
@@ -697,6 +915,9 @@ AWindowGUI::AWindowGUI(MWindow *mwindow, AWindow *awindow)
        vicon_audio = 0;
        vicon_drawing = 1;
        displayed_folder = AW_NO_FOLDER;
+       new_folder_thread = 0;
+       modify_folder_thread = 0;
+       folder_lock = new Mutex("AWindowGUI::folder_lock");
 }
 
 AWindowGUI::~AWindowGUI()
@@ -710,18 +931,11 @@ AWindowGUI::~AWindowGUI()
        labellist.remove_all_objects();
        displayed_assets[1].remove_all_objects();
 
+       delete new_folder_thread;
+       delete modify_folder_thread;
        delete vicon_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;
@@ -747,6 +961,7 @@ AWindowGUI::~AWindowGUI()
        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)
@@ -856,7 +1071,7 @@ void AWindowGUI::create_objects()
        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));
@@ -868,9 +1083,12 @@ void AWindowGUI::create_objects()
        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);
+       new_folder_thread = new NewFolderThread(this);
+       modify_folder_thread = new ModifyFolderThread(this);
 
        int x1 = mwindow->theme->alist_x, y1 = mwindow->theme->alist_y;
        int w1 = mwindow->theme->alist_w, h1 = mwindow->theme->alist_h;
@@ -881,6 +1099,7 @@ void AWindowGUI::create_objects()
        add_subwindow(asset_list = new AWindowAssets(mwindow, this, x1, y1, w1, h1));
 
        vicon_thread = new VIconThread(asset_list);
+       asset_list->update_vicon_area();
        vicon_thread->start();
        vicon_audio = new AssetVIconAudio(this);
 
@@ -901,19 +1120,19 @@ void AWindowGUI::create_objects()
        add_subwindow(folder_list = new AWindowFolders(mwindow,
                this, fx, fy, fw, fh));
        update_effects();
+       folder_list->load_expanders();
 
        //int x = mwindow->theme->abuttons_x;
        //int y = mwindow->theme->abuttons_y;
 
-
-       newfolder_thread = new NewFolderThread(mwindow, this);
-
        add_subwindow(asset_menu = new AssetPopup(mwindow, this));
        asset_menu->create_objects();
        add_subwindow(clip_menu = new ClipPopup(mwindow, 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();
@@ -923,6 +1142,8 @@ void AWindowGUI::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();
@@ -965,6 +1186,7 @@ int AWindowGUI::resize_event(int w, int h)
 //     view->reposition_window(x, y);
 
        BC_WindowBase::resize_event(w, h);
+       asset_list->update_vicon_area();
        return 1;
 }
 
@@ -1026,17 +1248,68 @@ int AWindowGUI::close_event()
 
 void AWindowGUI::start_vicon_drawing()
 {
-       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();
+       if( !vicon_drawing || !vicon_thread->interrupted ) return;
+       if( mwindow->edl->session->awindow_folder == AW_MEDIA_FOLDER ||
+           mwindow->edl->session->awindow_folder >= AWINDOW_USER_FOLDERS ) {
+               switch( mwindow->edl->session->assetlist_format ) {
+               case ASSETS_ICONS:
+               case ASSETS_ICONS_PACKED:
+               case ASSETS_ICON_LIST:
+                       asset_list->update_vicon_area();
+                       vicon_thread->start_drawing();
+                       break;
+               default:
+                       break;
+               }
+       }
 }
 
 void AWindowGUI::stop_vicon_drawing()
 {
+       if( vicon_thread->interrupted ) return;
        vicon_thread->stop_drawing();
 }
 
+VFrame *AssetPicon::get_vicon_frame()
+{
+       if( !vicon ) return 0;
+       if( gui->vicon_thread->interrupted ) return 0;
+       VFrame *frame = vicon->frame();
+       if( !frame ) return 0;
+       if( !vicon_frame )
+               vicon_frame = new VFrame(vicon->vw, vicon->vh, frame->get_color_model());
+       vicon_frame->transfer_from(frame);
+       return vicon_frame;
+}
+
+int AWindowGUI::cycle_assetlist_format()
+{
+       EDLSession *session = mwindow->edl->session;
+       int format = ASSETS_TEXT;
+       if( allow_iconlisting ) {
+               switch( session->assetlist_format ) {
+               case ASSETS_TEXT:
+                       format = ASSETS_ICONS;
+                       break;
+               case ASSETS_ICONS:
+                       format = ASSETS_ICONS_PACKED;
+                       break;
+               case ASSETS_ICONS_PACKED:
+                       format = ASSETS_ICON_LIST;
+                       break;
+               case ASSETS_ICON_LIST:
+                       format = ASSETS_TEXT;
+                       break;
+               }
+       }
+       stop_vicon_drawing();
+       session->assetlist_format = format;
+       asset_list->update_format(session->assetlist_format, 0);
+       async_update_assets();
+       start_vicon_drawing();
+       return 1;
+}
+
 AWindowRemovePluginGUI::
 AWindowRemovePluginGUI(AWindow *awindow, AWindowRemovePlugin *thread,
        int x, int y, PluginServer *plugin)
@@ -1060,6 +1333,7 @@ AWindowRemovePluginGUI::
 
 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);
@@ -1073,6 +1347,7 @@ void AWindowRemovePluginGUI::create_objects()
                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)
@@ -1164,6 +1439,14 @@ int AWindowGUI::keypress_event()
                        return 1;
                }
                break;
+       case 'o':
+               if( !ctrl_down() && !shift_down() ) {
+                       assetlist_menu->load_file->handle_event();
+                       return 1;
+               }
+               break;
+       case 'v':
+               return cycle_assetlist_format();
        case DELETE:
                if( shift_down() ) {
                        PluginServer* plugin = selected_plugin();
@@ -1184,7 +1467,7 @@ int AWindowGUI::create_custom_xatoms()
        UpdateAssetsXAtom = create_xatom("CWINDOWGUI_UPDATE_ASSETS");
        return 0;
 }
-int AWindowGUI::recieve_custom_xatoms(xatom_event *event)
+int AWindowGUI::receive_custom_xatoms(xatom_event *event)
 {
        if( event->message_type == UpdateAssetsXAtom ) {
                update_assets();
@@ -1210,12 +1493,12 @@ void AWindowGUI::update_folder_list()
 
 // Search assets for folders
        for( int i = 0; i < mwindow->edl->folders.total; i++ ) {
-               const char *folder = mwindow->edl->folders.values[i];
+               BinFolder *bin_folder = mwindow->edl->folders[i];
                int exists = 0;
 
                for( int j = 0; j < folders.total; j++ ) {
-                       AssetPicon *picon = (AssetPicon*)folders.values[j];
-                       if( !strcasecmp(picon->get_text(), folder) ) {
+                       AssetPicon *picon = (AssetPicon*)folders[j];
+                       if( !strcasecmp(picon->get_text(), bin_folder->title) ) {
                                exists = 1;
                                picon->in_use = 1;
                                break;
@@ -1223,23 +1506,26 @@ void AWindowGUI::update_folder_list()
                }
 
                if( !exists ) {
-                       int aw_folder = folder_number(folder);
-                       if( aw_folder >= 0 ) {
-                               AssetPicon *picon = new AssetPicon(mwindow, this, aw_folder, 1);
-                               picon->create_objects();
-                               folders.append(picon);
-                       }
+                       const char *title = bin_folder->title;
+                       int folder = bin_folder->awindow_folder;
+                       AssetPicon *picon = new AssetPicon(mwindow, this, folder, title);
+                       picon->create_objects();
+                       folders.append(picon);
                }
        }
 
 // Delete unused non-persistent folders
+       int do_autoplace = 0;
        for( int i=folders.total; --i>=0; ) {
                AssetPicon *picon = (AssetPicon*)folders.values[i];
                if( !picon->in_use && !picon->persistent ) {
                        delete picon;
                        folders.remove_number(i);
+                       do_autoplace = 1;
                }
        }
+       if( do_autoplace )
+               folder_list->set_autoplacement(&folders, 0, 1);
 }
 
 void AWindowGUI::create_persistent_folder(ArrayList<BC_ListBoxItem*> *output,
@@ -1274,22 +1560,24 @@ void AWindowGUI::create_label_folder()
 
 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.total; i++ ) {
+       for( int i=0; i<mwindow->edl->clips.size(); ++i ) {
                int exists = 0;
 
 // Look for clip in existing listitems
                for( int j = 0; j < assets.total && !exists; j++ ) {
                        AssetPicon *picon = (AssetPicon*)assets.values[j];
 
-                       if( picon->id == mwindow->edl->clips.values[i]->id ) {
-                               picon->edl = mwindow->edl->clips.values[i];
-                               picon->set_text(mwindow->edl->clips.values[i]->local_session->clip_title);
+                       if( picon->id == mwindow->edl->clips[i]->id ) {
+                               picon->edl = mwindow->edl->clips[i];
+                               picon->set_text(mwindow->edl->clips[i]->local_session->clip_title);
                                exists = 1;
                                picon->in_use = 1;
                        }
@@ -1298,16 +1586,13 @@ void AWindowGUI::update_asset_list()
 // Create new listitem
                if( !exists ) {
                        AssetPicon *picon = new AssetPicon(mwindow,
-                               this, mwindow->edl->clips.values[i]);
-                       picon->create_objects();
-                       assets.append(picon);
+                               this, mwindow->edl->clips[i]);
+                       new_assets.append(picon);
                }
        }
 
 // Synchronize EDL assets
-       for( Asset *current = mwindow->edl->assets->first;
-               current;
-               current = NEXT ) {
+       for( Asset *current=mwindow->edl->assets->first; current; current=NEXT ) {
                int exists = 0;
 
 // Look for asset in existing listitems
@@ -1316,9 +1601,8 @@ void AWindowGUI::update_asset_list()
 
                        if( picon->id == current->id ) {
                                picon->indexable = current;
-                               exists = 1;
                                picon->in_use = 1;
-                               break;
+                               exists = 1;
                        }
                }
 
@@ -1326,40 +1610,44 @@ void AWindowGUI::update_asset_list()
                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++ ) {
+       for( int i=0; i<mwindow->edl->nested_edls.size(); ++i ) {
                int exists = 0;
-               Indexable *indexable = mwindow->edl->nested_edls->get(i);
+               EDL *nested_edl = mwindow->edl->nested_edls[i];
 
 // Look for asset in existing listitems
-               for( int j = 0; j < assets.total && !exists; j++ ) {
+               for( int j=0; j<assets.total && !exists; ++j ) {
                        AssetPicon *picon = (AssetPicon*)assets.values[j];
 
-                       if( picon->id == indexable->id ) {
-                               picon->indexable = indexable;
-                               exists = 1;
+                       if( picon->id == nested_edl->id ) {
+                               picon->indexable = nested_edl;
                                picon->in_use = 1;
-                               break;
+                               exists = 1;
                        }
                }
 
 // Create new listitem
                if( !exists ) {
                        AssetPicon *picon = new AssetPicon(mwindow,
-                               this, indexable);
-                       picon->create_objects();
-                       assets.append(picon);
+                               this, (Indexable*)nested_edl);
+                       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);
@@ -1368,9 +1656,11 @@ void AWindowGUI::update_asset_list()
                        assets.remove_number(i);
                        continue;
                }
-               if( !picon->indexable || !picon->indexable->is_asset ) continue;
-               struct stat st;
-               picon->mtime = !stat(picon->indexable->path, &st) ? st.st_mtime : 0;
+               if( picon->indexable && picon->indexable->is_asset ) {
+                       struct stat st;
+                       picon->comments_time = !stat(picon->indexable->path, &st) ?
+                               st.st_mtime : 0;
+               }
        }
 }
 
@@ -1397,8 +1687,9 @@ void AWindowGUI::update_picon(Indexable *indexable)
        }
 }
 
-void AWindowGUI::sort_assets(int use_mtime)
+void AWindowGUI::sort_assets()
 {
+       folder_lock->lock("AWindowGUI::sort_assets");
        switch( mwindow->edl->session->awindow_folder ) {
        case AW_AEFFECT_FOLDER:
                sort_picons(&aeffects);
@@ -1416,32 +1707,86 @@ void AWindowGUI::sort_assets(int use_mtime)
                sort_picons(&labellist);
                break;
        default:
-               sort_picons(&assets, use_mtime);
+               sort_picons(&assets);
+               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();
 }
 
-void AWindowGUI::collect_assets()
+EDL *AWindowGUI::collect_proxy(Indexable *indexable)
+{
+       Asset *proxy_asset = (Asset *)indexable;
+       char path[BCTEXTLEN];
+       int proxy_scale = mwindow->edl->session->proxy_scale;
+       ProxyRender::from_proxy_path(path, proxy_asset, proxy_scale);
+       Asset *unproxy_asset = mwindow->edl->assets->get_asset(path);
+       if( !unproxy_asset || !unproxy_asset->layers ) return 0;
+// make a clip from proxy video tracks and unproxy audio tracks
+       EDL *proxy_edl = new EDL(mwindow->edl);
+       proxy_edl->create_objects();
+       proxy_edl->set_path(proxy_asset->path);
+       FileSystem fs;  fs.extract_name(path, proxy_asset->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;
+       proxy_edl->session->audio_tracks = unproxy_asset->channels;
+       proxy_edl->create_default_tracks();
+       double length = proxy_asset->frame_rate > 0 ?
+               ( proxy_asset->video_length >= 0 ?
+                       ( proxy_asset->video_length / proxy_asset->frame_rate ) :
+                       ( proxy_edl->session->si_useduration ?
+                               proxy_edl->session->si_duration :
+                               1.0 / proxy_asset->frame_rate ) ) :
+               1.0 / proxy_edl->session->frame_rate;
+       Track *current = proxy_edl->tracks->first;
+       for( int vtrack=0; current; current=NEXT ) {
+               if( current->data_type != TRACK_VIDEO ) continue;
+               current->insert_asset(proxy_asset, 0, length, 0, vtrack++);
+       }
+       length = (double)unproxy_asset->audio_length / unproxy_asset->sample_rate;
+       current = proxy_edl->tracks->first;
+       for( int atrack=0; current; current=NEXT ) {
+               if( current->data_type != TRACK_AUDIO ) continue;
+               current->insert_asset(unproxy_asset, 0, length, 0, atrack++);
+       }
+       proxy_edl->awindow_folder = AW_PROXY_FOLDER;
+       return proxy_edl;
+}
+
+
+void AWindowGUI::collect_assets(int proxy)
 {
-       int i = 0;
        mwindow->session->drag_assets->remove_all();
        mwindow->session->drag_clips->remove_all();
-       while(1)
-       {
-               AssetPicon *result = (AssetPicon*)asset_list->get_selection(0, i++);
-               if( !result ) break;
-
-               if( result->indexable ) mwindow->session->drag_assets->append(result->indexable);
-               if( result->edl ) mwindow->session->drag_clips->append(result->edl);
+       int i = 0;  AssetPicon *result;
+       while( (result = (AssetPicon*)asset_list->get_selection(0, i++)) != 0 ) {
+               Indexable *indexable = result->indexable;
+               if( proxy && indexable && indexable->is_asset &&
+                   indexable->awindow_folder == AW_PROXY_FOLDER ) {
+                       EDL *drag_edl = collect_proxy(indexable);
+                       if( drag_edl ) mwindow->session->drag_clips->append(drag_edl);
+                       continue;
+               }
+               if( indexable ) {
+                       mwindow->session->drag_assets->append(indexable);
+                       continue;
+               }
+               if( result->edl ) {
+                       mwindow->session->drag_clips->append(result->edl);
+                       continue;
+               }
        }
 }
 
@@ -1451,27 +1796,61 @@ void AWindowGUI::copy_picons(ArrayList<BC_ListBoxItem*> *dst,
 // Remove current pointers
        dst[0].remove_all();
        dst[1].remove_all_objects();
+       AWindowFolderSubItems *sub_items = 0;
+       if( folder >= 0 && folder < AW_LABEL_FOLDER ) {
+               AssetPicon *picon = 0;
+               for( int k=folders.size(); --k>=0; ) {
+                       picon = (AssetPicon*)folders[k];
+                       if( picon->foldernum == folder ) break;
+               }
+               if( picon )
+                       sub_items = picon->sub_items;
+               folder = AW_NO_FOLDER;
+       }
+       BinFolder *bin_folder = folder < AWINDOW_USER_FOLDERS ? 0 :
+               mwindow->edl->get_folder(folder);
 
 // Create new pointers
        for( int i = 0; i < src->total; i++ ) {
+               int visible = folder < 0 ? 1 : 0;
                AssetPicon *picon = (AssetPicon*)src->values[i];
-               if( folder < 0 ||
-                   (picon->indexable && picon->indexable->awindow_folder == folder) ||
-                   (picon->edl && picon->edl->local_session->awindow_folder == folder) ) {
+               picon->sort_key = -1;
+               if( !visible && bin_folder ) {
+                       Indexable *idxbl = bin_folder->is_clips ? (Indexable *)picon->edl :
+                           picon->indexable ? picon->indexable :
+                           picon->edl ? picon->edl->get_proxy_asset() : 0;
+                       if( idxbl ) {
+                               picon->sort_key = mwindow->edl->folders.matches_indexable(folder, idxbl);
+                               if( picon->sort_key < 0 ) continue;
+                               visible = 1;
+                       }
+               }
+               if( !visible && picon->indexable && picon->indexable->awindow_folder == folder )
+                       visible = 1;
+               if( !visible && picon->edl && picon->edl->local_session->folder == folder )
+                       visible = 1;
+               if( visible && sub_items ) {
+                       if( !sub_items->matches(picon->get_text()) )
+                               visible = 0;
+               }
+               if( visible ) {
                        const char *text = search_text->get_text();
-                       int hidden = text && text[0] && !bstrcasestr(picon->get_text(), text);
-                       if( picon->vicon ) picon->vicon->hidden = hidden;
-                       if( hidden ) continue;
+                       if( text && text[0] )
+                               visible = bstrcasestr(picon->get_text(), text) ? 1 : 0;
+               }
+               if( picon->vicon )
+                       picon->vicon->hidden = !visible ? 1 : 0;
+               if( visible ) {
                        BC_ListBoxItem *item2, *item1;
                        dst[0].append(item1 = picon);
                        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 ) {
+                       else if( picon->comments_time ) {
                                char date_time[BCSTRLEN];
-                               struct tm stm;  localtime_r(&picon->mtime, &stm);
+                               struct tm stm;  localtime_r(&picon->comments_time, &stm);
                                sprintf(date_time,"%04d.%02d.%02d %02d:%02d:%02d",
                                         stm.tm_year+1900, stm.tm_mon+1, stm.tm_mday,
                                         stm.tm_hour, stm.tm_min, stm.tm_sec);
@@ -1485,7 +1864,7 @@ void AWindowGUI::copy_picons(ArrayList<BC_ListBoxItem*> *dst,
        }
 }
 
-void AWindowGUI::sort_picons(ArrayList<BC_ListBoxItem*> *src, int use_mtime)
+void AWindowGUI::sort_picons(ArrayList<BC_ListBoxItem*> *src)
 {
        int done = 0, changed = 0;
        while( !done ) {
@@ -1493,12 +1872,20 @@ void AWindowGUI::sort_picons(ArrayList<BC_ListBoxItem*> *src, int use_mtime)
                for( int i=0; i<src->total-1; ++i ) {
                        AssetPicon *item1 = (AssetPicon *)src->values[i];
                        AssetPicon *item2 = (AssetPicon *)src->values[i + 1];
-                       if( use_mtime ? item1->mtime > item2->mtime :
-                           strcmp(item1->get_text(), item2->get_text()) > 0 ) {
-                               src->values[i + 1] = item1;
-                               src->values[i] = item2;
-                               done = 0;  changed = 1;
+                       double v = item2->sort_key - item1->sort_key;
+                       if( v > 0 ) continue;
+                       if( v == 0 ) {
+                               const char *cp1 = item1->get_text();
+                               const char *bp1 = strrchr(cp1, '/');
+                               if( bp1 ) cp1 = bp1 + 1;
+                               const char *cp2 = item2->get_text();
+                               const char *bp2 = strrchr(cp2, '/');
+                               if( bp2 ) cp2 = bp2 + 1;
+                               if( strcmp(cp2, cp1) >= 0 ) continue;
                        }
+                       src->values[i + 1] = item1;
+                       src->values[i] = item2;
+                       done = 0;  changed = 1;
                }
        }
        if( changed ) {
@@ -1510,25 +1897,25 @@ void AWindowGUI::sort_picons(ArrayList<BC_ListBoxItem*> *src, int use_mtime)
        }
 }
 
-
 void AWindowGUI::filter_displayed_assets()
 {
        //allow_iconlisting = 1;
        asset_titles[0] = C_("Title");
        asset_titles[1] = _("Comments");
+       int folder = mwindow->edl->session->awindow_folder;
 
-       switch( mwindow->edl->session->awindow_folder ) {
+       switch( folder ) {
        case AW_AEFFECT_FOLDER:
-               copy_picons(displayed_assets, &aeffects, AW_NO_FOLDER);
+               copy_picons(displayed_assets, &aeffects, folder);
                break;
        case AW_VEFFECT_FOLDER:
-               copy_picons(displayed_assets, &veffects, AW_NO_FOLDER);
+               copy_picons(displayed_assets, &veffects, folder);
                break;
        case AW_ATRANSITION_FOLDER:
-               copy_picons(displayed_assets, &atransitions, AW_NO_FOLDER);
+               copy_picons(displayed_assets, &atransitions, folder);
                break;
        case AW_VTRANSITION_FOLDER:
-               copy_picons(displayed_assets, &vtransitions, AW_NO_FOLDER);
+               copy_picons(displayed_assets, &vtransitions, folder);
                break;
        case AW_LABEL_FOLDER:
                copy_picons(displayed_assets, &labellist, AW_NO_FOLDER);
@@ -1554,6 +1941,7 @@ void AWindowGUI::filter_displayed_assets()
 void AWindowGUI::update_assets()
 {
        stop_vicon_drawing();
+       folder_lock->lock("AWindowGUI::update_assets");
        update_folder_list();
        update_asset_list();
        labellist.remove_all_objects();
@@ -1561,7 +1949,9 @@ void AWindowGUI::update_assets()
 
        if( displayed_folder != mwindow->edl->session->awindow_folder )
                search_text->clear();
+       vicon_thread->hide_vicons();
        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);
@@ -1601,14 +1991,6 @@ void AWindowGUI::update_effects()
        create_persistent_folder(&vtransitions, 0, 1, 0, 1);
 }
 
-int AWindowGUI::folder_number(const char *name)
-{
-       for( int i = 0; i < AWINDOW_FOLDERS; i++ ) {
-               if( !strcasecmp(name, folder_names[i]) ) return i;
-       }
-       return AW_NO_FOLDER;
-}
-
 int AWindowGUI::drag_motion()
 {
        if( get_hidden() ) return 0;
@@ -1620,7 +2002,6 @@ int AWindowGUI::drag_motion()
 int AWindowGUI::drag_stop()
 {
        if( get_hidden() ) return 0;
-
        return 0;
 }
 
@@ -1700,7 +2081,7 @@ int AWindowDivider::button_release_event()
 
 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
@@ -1715,6 +2096,8 @@ AWindowFolders::AWindowFolders(MWindow *mwindow, AWindowGUI *gui, int x, int y,
        this->mwindow = mwindow;
        this->gui = gui;
        set_drag_scroll(0);
+       last_item0 = 0;
+       last_item1 = 0;
 }
 
 AWindowFolders::~AWindowFolders()
@@ -1723,8 +2106,21 @@ AWindowFolders::~AWindowFolders()
 
 int AWindowFolders::selection_changed()
 {
-       AssetPicon *picon = (AssetPicon*)get_selection(0, 0);
-       if( picon ) {
+       AWindowFolderItem *item0 = (AWindowFolderItem*)get_selection(0, 0);
+       AWindowFolderItem *item1 = (AWindowFolderItem*)get_selection(0, 1);
+// prefer expanded entry
+       AWindowFolderItem *item = item1 ? item1 : item0;
+       if( item0 && item1 && last_item0 == item0 && last_item1 == item1 ) {
+               item1->set_selected(0);
+               item1 = 0;
+               item = item0;
+       }
+       last_item0 = item0;
+       last_item1 = item1;
+       if( item ) {
+               AssetPicon *picon = item->get_picon();
+               picon->sub_items = (AWindowFolderSubItems*)(!item->parent ? 0 : item);
+
                gui->stop_vicon_drawing();
 
                if( get_button_down() && get_buttonpress() == 3 ) {
@@ -1759,16 +2155,101 @@ int AWindowFolders::button_press_event()
        return result;
 }
 
+int AWindowFolders::drag_stop()
+{
+       int result = 0;
+       if( get_hidden() ) return 0;
+       if( mwindow->session->current_operation == DRAG_ASSET &&
+           gui->folder_list->cursor_above() ) { // check user folder
+               int item_no = gui->folder_list->get_cursor_item();
+               AssetPicon *picon = (AssetPicon *)(item_no < 0 ? 0 : gui->folders[item_no]);
+               if( picon && picon->foldernum >= AWINDOW_USER_FOLDERS ) {
+                       BinFolder *folder = mwindow->edl->get_folder(picon->foldernum);
+                       ArrayList<Indexable *> *drags = folder->is_clips ?
+                               ((ArrayList<Indexable *> *)mwindow->session->drag_clips) :
+                               ((ArrayList<Indexable *> *)mwindow->session->drag_assets);
+                       if( folder && drags && !folder->add_patterns(drags, shift_down()) )
+                               flicker(1,30);
+                       mwindow->session->current_operation = ::NO_OPERATION;
+                       result = 1;
+               }
+       }
+       return result;
+}
 
+AWindowFolderSubItems::AWindowFolderSubItems(AWindowFolderItem *parent, const char *text)
+ : AWindowFolderItem(text)
+{
+       this->parent = parent;
+}
 
+int AWindowFolders::load_expanders()
+{
+       char expanders_path[BCTEXTLEN];
+       mwindow->create_defaults_path(expanders_path, EXPANDERS_FILE);
+       FILE *fp = fopen(expanders_path, "r");
+       if( !fp ) {
+               snprintf(expanders_path, sizeof(expanders_path), "%s/%s",
+                       File::get_cindat_path(), EXPANDERS_FILE);
+               fp = fopen(expanders_path, "r");
+       }
 
-
+       if( !fp ) return 1;
+       const char tab = '\t';
+       char line[BCTEXTLEN];   line[0] = 0;
+       AWindowFolderItem *item = 0, *parent;
+       AWindowFolderSubItems *sub_items = 0;
+       int k = 0;
+       while( fgets(line,sizeof(line),fp) ) {
+               if( line[0] == '#' ) continue;
+               int i = strlen(line);
+               if( i > 0 && line[i-1] == '\n' ) line[--i] = 0;
+               if( i == 0 ) continue;
+               i = 0;
+               for( char *cp=line; *cp==tab; ++cp ) ++i;
+               if( i == 0 ) {
+                       int i = gui->folders.size();
+                       while( --i >= 0 ) {
+                               AssetPicon *folder = (AssetPicon *)gui->folders[i];
+                               if( !strcmp(folder->get_text(),_(line)) ) break;
+                       }
+                       item = (AWindowFolderItem*)(i >= 0 ? gui->folders[i] : 0);
+                       sub_items = 0;
+                       k = 0;
+                       continue;
+               }
+               if( i > k+1 ) continue;
+               if( i == k+1 ) {
+                       if( line[i] != '-' && sub_items ) {
+                               sub_items->names.append(cstrdup(_(&line[i])));
+                               continue;
+                       }
+                       parent = item;
+                       k = i;
+               }
+               else {
+                       while( i < k ) {
+                               item = item->parent;
+                               --k;
+                       }
+                       parent = item->parent;
+               }
+               ArrayList<BC_ListBoxItem*> *sublist = parent->get_sublist();
+               if( !sublist ) sublist = parent->new_sublist(1);
+               sub_items = new AWindowFolderSubItems(parent, &line[i]);
+               sublist->append(item = sub_items);
+       }
+       fclose(fp);
+       return 0;
+}
 
 
 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
@@ -1814,11 +2295,16 @@ int AWindowAssets::button_press_event()
                        gui->cliplist_menu->update();
                        gui->cliplist_menu->activate_menu();
                        break;
-               case AW_MEDIA_FOLDER:
                case AW_PROXY_FOLDER:
-                       gui->assetlist_menu->update_titles(folder==AW_MEDIA_FOLDER);
-                       gui->assetlist_menu->activate_menu();
+                       gui->proxylist_menu->update();
+                       gui->proxylist_menu->activate_menu();
                        break;
+               default:
+               case AW_MEDIA_FOLDER: {
+                       int shots =  folder==AW_MEDIA_FOLDER || folder>=AWINDOW_USER_FOLDERS;
+                       gui->assetlist_menu->update_titles(shots);
+                       gui->assetlist_menu->activate_menu();
+                       break; }
                }
                result = 1;
        }
@@ -1831,20 +2317,30 @@ int AWindowAssets::handle_event()
 {
        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;
 }
 
@@ -1872,6 +2368,11 @@ int AWindowAssets::selection_changed()
                        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();
@@ -1879,20 +2380,19 @@ int AWindowAssets::selection_changed()
                        break;
                }
 
-               BC_ListBox::deactivate_selection();
-               return 1;
+               deactivate_selection();
        }
-       else if( gui->vicon_drawing &&
-                get_button_down() && get_buttonpress() == 1 &&
-                (item = (AssetPicon*)get_selection(0, 0)) ) {
+       else if( gui->vicon_drawing && get_button_down() && get_buttonpress() == 1 &&
+                ( mwindow->edl->session->awindow_folder == AW_MEDIA_FOLDER ||
+                  mwindow->edl->session->awindow_folder >= AWINDOW_USER_FOLDERS ) &&
+                  (item = (AssetPicon*)get_selection(0, 0)) != 0 ) {
                VIcon *vicon = 0;
-               if( !gui->vicon_thread->viewing ) {
+               if( !gui->vicon_thread->vicon  ) {
                        vicon = item->vicon;
                }
                gui->vicon_thread->set_view_popup(vicon);
-
        }
-       return 0;
+       return 1;
 }
 
 void AWindowAssets::draw_background()
@@ -1900,17 +2400,16 @@ void AWindowAssets::draw_background()
        clear_box(0,0,get_w(),get_h(),get_bg_surface());
        set_color(BC_WindowBase::get_resources()->audiovideo_color);
        set_font(LARGEFONT);
-       int aw_folder = mwindow->edl->session->awindow_folder;
-       if( aw_folder < 0 ) return;
-       const char *aw_name = _(AWindowGUI::folder_names[aw_folder]);
-       draw_text(get_w() - get_text_width(LARGEFONT, aw_name) - 4, 30,
-               aw_name, -1, get_bg_surface());
+       int folder = mwindow->edl->session->awindow_folder;
+       const char *title = mwindow->edl->get_folder_name(folder);
+       draw_text(get_w() - get_text_width(LARGEFONT, title) - 4, 30,
+               title, -1, get_bg_surface());
 }
 
 int AWindowAssets::drag_start_event()
 {
        int collect_pluginservers = 0;
-       int collect_assets = 0;
+       int collect_assets = 0, proxy = 0;
 
        if( BC_ListBox::drag_start_event() ) {
                switch( mwindow->edl->session->awindow_folder ) {
@@ -1933,6 +2432,9 @@ int AWindowAssets::drag_start_event()
                case AW_LABEL_FOLDER:
                        // do nothing!
                        break;
+               case AW_PROXY_FOLDER:
+                       proxy = 1; // fall thru
+               case AW_MEDIA_FOLDER:
                default:
                        mwindow->session->current_operation = DRAG_ASSET;
                        collect_assets = 1;
@@ -1952,7 +2454,7 @@ int AWindowAssets::drag_start_event()
                }
 
                if( collect_assets ) {
-                       gui->collect_assets();
+                       gui->collect_assets(proxy);
                }
 
                return 1;
@@ -1982,6 +2484,18 @@ int AWindowAssets::drag_motion_event()
        mwindow->cwindow->gui->unlock_window();
 
        lock_window("AWindowAssets::drag_motion_event");
+       if( mwindow->session->current_operation == DRAG_ASSET &&
+           gui->folder_list->cursor_above() ) { // highlight user folder
+               int item_no = gui->folder_list->get_cursor_item();
+               if( item_no >= 0 ) {
+                       AssetPicon *folder = (AssetPicon *)gui->folders[item_no];
+                       if( folder->foldernum < AWINDOW_USER_FOLDERS ) item_no = -1;
+               }
+               int folder_xposition = gui->folder_list->get_xposition();
+               int folder_yposition = gui->folder_list->get_yposition();
+               gui->folder_list->update(&gui->folders, 0, 0, 1,
+                       folder_xposition, folder_yposition, item_no, 0, 1);
+       }
        return 0;
 }
 
@@ -2021,6 +2535,10 @@ int AWindowAssets::drag_stop_event()
        }
 
        lock_window("AWindowAssets::drag_stop_event");
+       if( !result ) {
+               result = gui->folder_list->drag_stop();
+       }
+
 
        if( result )
                get_drag_popup()->set_animation(0);
@@ -2028,6 +2546,7 @@ int AWindowAssets::drag_stop_event()
        BC_ListBox::drag_stop_event();
 // since NO_OPERATION is also defined in listbox, we have to reach for global scope...
        mwindow->session->current_operation = ::NO_OPERATION;
+
        return 1;
 }
 
@@ -2040,8 +2559,9 @@ int AWindowAssets::column_resize_event()
 
 int AWindowAssets::focus_in_event()
 {
+       int ret = BC_ListBox::focus_in_event();
        gui->start_vicon_drawing();
-       return 0;
+       return ret;
 }
 
 int AWindowAssets::focus_out_event()
@@ -2050,6 +2570,43 @@ int AWindowAssets::focus_out_event()
        return BC_ListBox::focus_out_event();
 }
 
+int AWindowAssets::cursor_enter_event()
+{
+       int ret = BC_ListBox::cursor_enter_event();
+       gui->start_vicon_drawing();
+       return ret;
+}
+
+int AWindowAssets::cursor_leave_event()
+{
+       gui->stop_vicon_drawing();
+       return BC_ListBox::cursor_leave_event();
+}
+
+void AWindowAssets::update_vicon_area()
+{
+       int x0 = 0, x1 = get_w();
+       int y0 = get_title_h();
+       int y1 = get_h();
+       if( is_highlighted() ) {
+               x0 += LISTBOX_BORDER;  x1 -= LISTBOX_BORDER;
+               y0 += LISTBOX_BORDER;  y1 -= LISTBOX_BORDER;
+       }
+       gui->vicon_thread->set_drawing_area(x0,y0, x1,y1);
+}
+
+int AWindowAssets::mouse_over_event(int no)
+{
+       if( gui->vicon_thread->viewing &&
+           no >= 0 && no < gui->displayed_assets[0].size() ) {
+               AssetPicon *picon = (AssetPicon *)gui->displayed_assets[0][no];
+               VIcon *vicon = picon->vicon;
+               picon->gui->vicon_thread->set_view_popup(vicon);
+       }
+       return 0;
+}
+
+
 AWindowSearchTextBox::AWindowSearchTextBox(AWindowSearchText *search_text, int x, int y, int w)
  : BC_TextBox(x, y, w, 1, "")
 {
@@ -2113,50 +2670,6 @@ void AWindowSearchText::clear()
        text_box->update("");
 }
 
-AWindowNewFolder::AWindowNewFolder(MWindow *mwindow, AWindowGUI *gui, int x, int y)
- : BC_Button(x, y, mwindow->theme->newbin_data)
-{
-       this->mwindow = mwindow;
-       this->gui = gui;
-       set_tooltip(_("New bin"));
-}
-
-int AWindowNewFolder::handle_event()
-{
-       gui->newfolder_thread->start_new_folder();
-       return 1;
-}
-
-AWindowDeleteFolder::AWindowDeleteFolder(MWindow *mwindow, AWindowGUI *gui, int x, int y)
- : BC_Button(x, y, mwindow->theme->deletebin_data)
-{
-       this->mwindow = mwindow;
-       this->gui = gui;
-       set_tooltip(_("Delete bin"));
-}
-
-int AWindowDeleteFolder::handle_event()
-{
-       if( gui->folder_list->get_selection(0, 0) ) {
-               BC_ListBoxItem *folder = gui->folder_list->get_selection(0, 0);
-               mwindow->delete_folder(folder->get_text());
-       }
-       return 1;
-}
-
-AWindowRenameFolder::AWindowRenameFolder(MWindow *mwindow, AWindowGUI *gui, int x, int y)
- : BC_Button(x, y, mwindow->theme->renamebin_data)
-{
-       this->mwindow = mwindow;
-       this->gui = gui;
-       set_tooltip(_("Rename bin"));
-}
-
-int AWindowRenameFolder::handle_event()
-{
-       return 1;
-}
-
 AWindowDeleteDisk::AWindowDeleteDisk(MWindow *mwindow, AWindowGUI *gui, int x, int y)
  : BC_Button(x, y, mwindow->theme->deletedisk_data)
 {
@@ -2261,10 +2774,14 @@ AddTools::AddTools(MWindow *mwindow, AWindowGUI *gui, int x, int y, const char *
 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;
@@ -2283,8 +2800,9 @@ void AddTools::create_objects()
 
 #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")
@@ -2322,7 +2840,7 @@ AVIconDrawing::AVIconDrawing(AWindowGUI *agui, int x, int y, VFrame **images)
  : BC_Toggle(x, y, images, agui->vicon_drawing)
 {
        this->agui = agui;
-       set_tooltip(_("draw vicons"));
+       set_tooltip(_("Preview"));
 }
 
 void AVIconDrawing::calculate_geometry(AWindowGUI *agui, VFrame **images, int *ww, int *hh)
@@ -2350,7 +2868,7 @@ int AVIconDrawing::handle_event()
 
 
 AWindowListFormat::AWindowListFormat(MWindow *mwindow, AWindowGUI *gui)
- : BC_MenuItem("")
+ : BC_MenuItem("","v",'v')
 {
        this->mwindow = mwindow;
        this->gui = gui;
@@ -2358,31 +2876,28 @@ AWindowListFormat::AWindowListFormat(MWindow *mwindow, AWindowGUI *gui)
 
 int AWindowListFormat::handle_event()
 {
-       gui->stop_vicon_drawing();
+       return gui->cycle_assetlist_format();
+}
 
+void AWindowListFormat::update()
+{
        EDLSession *session = mwindow->edl->session;
+       const char *text = 0;
        switch( session->assetlist_format ) {
        case ASSETS_TEXT:
-               session->assetlist_format = ASSETS_ICONS;
+               text = _("Display icons");
                break;
        case ASSETS_ICONS:
-               session->assetlist_format = ASSETS_TEXT;
+               text = _("Display icons packed");
+               break;
+       case ASSETS_ICONS_PACKED:
+               text = _("Display icon list");
+               break;
+       case ASSETS_ICON_LIST:
+               text = _("Display text");
                break;
        }
-
-       gui->asset_list->update_format(session->assetlist_format, 1);
-       if( !mwindow->awindow->gui->allow_iconlisting ) {
-               mwindow->edl->session->assetlist_format = ASSETS_TEXT;
-       }
-
-       gui->start_vicon_drawing();
-       return 1;
-}
-
-void AWindowListFormat::update()
-{
-       set_text(mwindow->edl->session->assetlist_format == ASSETS_TEXT ?
-               (char*)_("Display icons") : (char*)_("Display text"));
+       set_text(text);
 }
 
 AWindowListSort::AWindowListSort(MWindow *mwindow, AWindowGUI *gui)
@@ -2394,7 +2909,7 @@ AWindowListSort::AWindowListSort(MWindow *mwindow, AWindowGUI *gui)
 
 int AWindowListSort::handle_event()
 {
-       gui->sort_assets(0);
+       gui->sort_assets();
        return 1;
 }