more ru xlats, doc updates, proxy tweaks
[goodguy/history.git] / cinelerra-5.1 / cinelerra / mwindow.C
index 2c0ddff46de8ebc2c648ea7296982172cc6268aa..992e9f342823dff1d3cec31537a08a3269725982 100644 (file)
@@ -18,6 +18,7 @@
  *
  */
 
+#include "aboutprefs.h"
 #include "asset.h"
 #include "assets.h"
 #include "atrack.h"
@@ -37,6 +38,7 @@
 #include "channeldb.h"
 #include "channelinfo.h"
 #include "clip.h"
+#include "clipedls.h"
 #include "bccmodels.h"
 #include "commercials.h"
 #include "cplayback.h"
@@ -79,7 +81,6 @@
 #include "mutex.h"
 #include "mwindowgui.h"
 #include "mwindow.h"
-#include "nestededls.h"
 #include "new.h"
 #include "panautos.h"
 #include "patchbay.h"
@@ -89,6 +90,7 @@
 #include "pluginserver.h"
 #include "pluginset.h"
 #include "preferences.h"
+#include "proxy.h"
 #include "record.h"
 #include "recordmonitor.h"
 #include "recordlabel.h"
 #include "theme.h"
 #include "threadloader.h"
 #include "timebar.h"
+#include "timelinepane.h"
 #include "tipwindow.h"
 #include "trackcanvas.h"
 #include "track.h"
 #include "wavecache.h"
 #include "wwindow.h"
 #include "zoombar.h"
+#include "zwindow.h"
+#include "zwindowgui.h"
 #include "exportedl.h"
 
 #include "defaultformats.h"
@@ -180,6 +185,7 @@ MWindow::MWindow()
        plugin_gui_lock = new Mutex("MWindow::plugin_gui_lock");
        dead_plugin_lock = new Mutex("MWindow::dead_plugin_lock");
        vwindows_lock = new Mutex("MWindow::vwindows_lock");
+       zwindows_lock = new Mutex("MWindow::zwindows_lock");
        brender_lock = new Mutex("MWindow::brender_lock");
        keyframe_gui_lock = new Mutex("MWindow::keyframe_gui_lock");
 
@@ -204,7 +210,6 @@ MWindow::MWindow()
        strcpy(cin_lang,"en");
        channeldb_buz =  new ChannelDB;
        channeldb_v4l2jpeg =  new ChannelDB;
-       //file_server = 0;
        plugin_guis = 0;
        dead_plugins = 0;
        keyframe_threads = 0;
@@ -224,6 +229,8 @@ MWindow::MWindow()
        restart_status = 0;
        screens = 1;
        in_destructor = 0;
+       speed_edl = 0;
+       proxy_beep = 0;
 }
 
 
@@ -231,22 +238,22 @@ MWindow::MWindow()
 MWindow::~MWindow()
 {
        run_lock->lock("MWindow::~MWindow");
-       stop_playback(1);
        in_destructor = 1;
 //printf("MWindow::~MWindow %d\n", __LINE__);
-       gui->stop_drawing();
        gui->remote_control->deactivate();
        gui->record->stop();
 #ifdef HAVE_DVB
        gui->channel_info->stop();
 #endif
+       delete proxy_beep;
        delete create_bd;       create_bd = 0;
        delete create_dvd;      create_dvd = 0;
        delete batch_render;    batch_render = 0;
        delete render;          render = 0;
        commit_commercial();
        if( commercials && !commercials->remove_user() ) commercials = 0;
-
+       close_mixers();
+       if( speed_edl ) { speed_edl->remove_user();  speed_edl = 0; }
 // Save defaults for open plugins
        plugin_gui_lock->lock("MWindow::~MWindow");
        for(int i = 0; i < plugin_guis->size(); i++) {
@@ -272,6 +279,7 @@ MWindow::~MWindow()
        if( twindow && twindow->is_running() ) twindow->close_window();
        if( wwindow && wwindow->is_running() ) wwindow->close_window();
        vwindows.remove_all_objects();
+       zwindows.remove_all_objects();
        gui->close(0);
        if( awindow ) awindow->join();
        if( cwindow ) cwindow->join();
@@ -292,6 +300,7 @@ MWindow::~MWindow()
        close_gui(twindow);
        close_gui(wwindow);
        vwindows.remove_all_objects();
+       zwindows.remove_all_objects();
        gui->close(0);
        join();
 #endif
@@ -311,7 +320,6 @@ MWindow::~MWindow()
        delete gwindow;         gwindow = 0;
        delete cwindow;         cwindow = 0;
        delete gui;             gui = 0;
-       //delete file_server;  file_server = 0; // reusable
        delete mainindexes;     mainindexes = 0;
        delete mainprogress;    mainprogress = 0;
        delete audio_cache;     audio_cache = 0;  // delete the cache after the assets
@@ -336,6 +344,7 @@ MWindow::~MWindow()
        delete dead_plugin_lock;
        delete plugin_gui_lock;
        delete vwindows_lock;
+       delete zwindows_lock;
        delete brender_lock;
        delete keyframe_gui_lock;
        colormodels.remove_all_objects();
@@ -462,6 +471,7 @@ void MWindow::init_defaults(BC_Hash* &defaults, char *config_path)
        else
                create_defaults_path(path, CONFIG_FILE);
 
+       delete defaults;
        defaults = new BC_Hash(path);
        defaults->load();
 }
@@ -552,6 +562,9 @@ int MWindow::load_plugin_index(MWindow *mwindow, const char *index_path, const c
                case PLUGIN_TYPE_FFMPEG: {
                        server = new_ffmpeg_server(mwindow, path);
                        break; }
+               case PLUGIN_TYPE_LV2: {
+                       server = new_lv2_server(mwindow, path);
+                       break; }
                }
                if( !server ) continue;
                plugins.append(server);
@@ -620,6 +633,7 @@ int MWindow::init_plugins(MWindow *mwindow, Preferences *preferences)
        fprintf(fp, "%s\n", plugin_path);
        init_plugin_index(mwindow, preferences, fp, plugin_path);
        init_ffmpeg_index(mwindow, preferences, fp);
+       init_lv2_index(mwindow, preferences, fp);
        fclose(fp);
        return load_plugin_index(mwindow, index_path, plugin_path);
 }
@@ -666,25 +680,6 @@ void MWindow::init_plugin_index(MWindow *mwindow, Preferences *preferences,
        scan_plugin_index(mwindow, preferences, fp, plugin_dir, ".", idx);
 }
 
-int MWindow::init_ladspa_index(MWindow *mwindow, Preferences *preferences,
-       const char *index_path, const char *plugin_dir)
-{
-       char plugin_path[BCTEXTLEN], *path = FileSystem::basepath(plugin_dir);
-       strcpy(plugin_path, path);  delete [] path;
-       printf("init ladspa index: %s\n", plugin_dir);
-       FILE *fp = fopen(index_path,"w");
-       if( !fp ) {
-               fprintf(stderr,_("MWindow::init_ladspa_index: "
-                       "can't create plugin index: %s\n"), index_path);
-               return 1;
-       }
-       fprintf(fp, "%d\n", PLUGIN_FILE_VERSION);
-       fprintf(fp, "%s\n", plugin_dir);
-       init_plugin_index(mwindow, preferences, fp, plugin_path);
-       fclose(fp);
-       return 0;
-}
-
 void MWindow::scan_plugin_index(MWindow *mwindow, Preferences *preferences, FILE *fp,
        const char *plug_dir, const char *plug_path, int &idx)
 {
@@ -737,18 +732,17 @@ void MWindow::add_plugins(ArrayList<PluginServer*> &plugins)
 
 void MWindow::init_plugin_tips(ArrayList<PluginServer*> &plugins, const char *lang)
 {
-       const char *cfg_path = File::get_cindat_path();
-       char msg_path[BCTEXTLEN];  int txt = 0;
+       const char *dat_path = File::get_cindat_path();
+       char msg_path[BCTEXTLEN];
        FILE *fp = 0;
        if( BC_Resources::language[0] ) {
                snprintf(msg_path, sizeof(msg_path), "%s/info/plugins.%s",
-                       cfg_path, lang);
+                       dat_path, lang);
                fp = fopen(msg_path, "r");
        }
        if( !fp ) {
-               txt = 1;
                snprintf(msg_path, sizeof(msg_path), "%s/info/plugins.txt",
-                       cfg_path);
+                       dat_path);
                fp = fopen(msg_path, "r");
        }
        if( !fp ) return;
@@ -767,9 +761,8 @@ void MWindow::init_plugin_tips(ArrayList<PluginServer*> &plugins, const char *la
                if( done ) {
                        if( tp > text && *--tp == '\n' ) *tp = 0;
                        if( title[0] ) {
-                               tp = !txt ? title : _(title);
                                int idx = plugins.size();
-                               while( --idx>=0 && strcmp(plugins[idx]->title, tp) );
+                               while( --idx>=0 && strcmp(plugins[idx]->title, title) );
                                if( idx >= 0 ) {
                                        delete [] plugins[idx]->tip;
                                        plugins[idx]->tip = cstrdup(text);
@@ -864,6 +857,20 @@ PluginServer* MWindow::scan_plugindb(char *title,
        return 0;
 }
 
+// repair session files with xlated plugin titles
+void MWindow::fix_plugin_title(char *title)
+{
+       for(int i = 0; i < plugindb->total; i++) {
+               PluginServer *server = plugindb->get(i);
+               if( !server->title ) continue;
+               const char *server_title = server->title;
+               if( !bstrcasecmp(title, _(server_title)) ) {
+                       strcpy(title, server_title);
+                       return;
+               }
+       }
+}
+
 int MWindow::plugin_exists(const char *plugin_path, ArrayList<PluginServer*> &plugins)
 {
        for( int i=0; i<plugins.size(); ++i )
@@ -876,10 +883,25 @@ int MWindow::plugin_exists(char *plugin_path)
        return !plugindb ? 0 : plugin_exists(plugin_path, *plugindb);
 }
 
+void MWindow::remove_plugin_index()
+{
+       char index_path[BCTEXTLEN];
+       MWindow::create_defaults_path(index_path, PLUGIN_FILE);
+       ::remove(index_path);
+}
+
 void MWindow::init_preferences()
 {
        preferences = new Preferences;
        preferences->load_defaults(defaults);
+       const char *lv2_path = getenv("LV2_PATH");
+       if( lv2_path && strcmp(lv2_path, preferences->lv2_path) ) {
+               strncpy(preferences->lv2_path, lv2_path, sizeof(preferences->lv2_path));
+               remove_plugin_index();
+       }
+       else if( !lv2_path && preferences->lv2_path[0] ) {
+               File::setenv_path("LV2_PATH",preferences->lv2_path, 0);
+       }
        session = new MainSession(this);
        session->load_defaults(defaults);
        // set x11_host, screens, window_config
@@ -895,6 +917,8 @@ void MWindow::init_preferences()
        }
        BC_WindowBase::get_resources()->popupmenu_btnup = preferences->popupmenu_btnup;
        BC_WindowBase::get_resources()->textbox_focus_policy = preferences->textbox_focus_policy;
+       BC_WindowBase::get_resources()->grab_input_focus = preferences->grab_input_focus;
+       YUV::yuv.yuv_set_colors(preferences->yuv_color_space, preferences->yuv_color_range);
 }
 
 void MWindow::clean_indexes()
@@ -1024,7 +1048,7 @@ void MWindow::init_theme()
                fprintf(stderr, _("MWindow::init_theme: prefered theme %s not found.\n"),
                         preferences->theme);
 
-       const char *default_theme = _(DEFAULT_THEME);
+       const char *default_theme = DEFAULT_THEME;
        if( !theme_plugin && strcasecmp(preferences->theme, default_theme) ) {
                fprintf(stderr, _("MWindow::init_theme: trying default theme %s\n"),
                        default_theme);
@@ -1060,8 +1084,8 @@ void MWindow::init_theme()
        theme->build_menus();
        init_menus();
 
+       theme->sort_image_sets();
        theme->check_used();
-
 //printf("MWindow::init_theme %d total_time=%d\n", __LINE__, (int)timer.get_difference());
 }
 
@@ -1115,6 +1139,308 @@ VWindow *MWindow::get_viewer(int start_it, int idx)
        return vwindow;
 }
 
+ZWindow *MWindow::get_mixer(Mixer *&mixer)
+{
+       zwindows_lock->lock("MWindow::get_mixer");
+       if( !mixer ) mixer = edl->mixers.new_mixer();
+       ZWindow *zwindow = 0;
+       for( int i=0; !zwindow && i<zwindows.size(); ++i )
+               if( zwindows[i]->idx < 0 ) zwindow = zwindows[i];
+       if( !zwindow )
+               zwindows.append(zwindow = new ZWindow(this));
+       zwindow->idx = mixer->idx;
+       zwindows_lock->unlock();
+       return zwindow;
+}
+
+void MWindow::del_mixer(ZWindow *zwindow)
+{
+       zwindows_lock->lock("MWindow::del_mixer 0");
+       edl->mixers.del_mixer(zwindow->idx);
+       if( session->selected_zwindow >= 0 ) {
+               int i = zwindows.number_of(zwindow);
+               if( i >= 0 && i < session->selected_zwindow )
+                       --session->selected_zwindow;
+               else if( i == session->selected_zwindow )
+                       session->selected_zwindow = -1;
+       }
+       zwindows_lock->unlock();
+       gui->lock_window("MWindow::del_mixer 1");
+       gui->update_mixers(0, -1);
+       gui->unlock_window();
+}
+
+void MWindow::start_mixer()
+{
+       Mixer *mixer = 0;
+       ZWindow *zwindow = get_mixer(mixer);
+       const char *title = 0;
+
+       for( Track *track=edl->tracks->first; track!=0; track=track->next ) {
+               PatchGUI *patchgui = get_patchgui(track);
+               if( !patchgui || !patchgui->mixer ) continue;
+               mixer->mixer_ids.append(track->get_mixer_id());
+               if( !title ) title = track->title;
+       }
+
+       session->selected_zwindow = -1;
+       gui->lock_window("MWindow::start_mixer");
+       gui->update_mixers(0, 0);
+       gui->unlock_window();
+
+       zwindow->set_title(title);
+       zwindow->start();
+       refresh_mixers();
+}
+
+int MWindow::mixer_track_active(Track *track)
+{
+       int i = session->selected_zwindow;
+       if( i < 0 || i >= zwindows.size() ) return 0;
+       ZWindow *zwindow = zwindows[i];
+       Mixer *mixer = edl->mixers.get_mixer(zwindow->idx);
+       if( !mixer ) return 0;
+       int n = mixer->mixer_ids.number_of(track->get_mixer_id());
+       return n >= 0 ? 1 : 0;
+}
+
+void MWindow::update_mixer_tracks()
+{
+       zwindows_lock->lock("MixPatch::handle_event");
+       int i = session->selected_zwindow;
+       if( i >= 0 && i < zwindows.size() ) {
+               ZWindow *zwindow = zwindows[i];
+               zwindow->update_mixer_ids();
+       }
+       zwindows_lock->unlock();
+}
+
+void MWindow::queue_mixers(EDL *edl, int command, int wait_tracking,
+               int use_inout, int update_refresh, int toggle_audio, int loop_play)
+{
+       zwindows_lock->lock("MWindow::queue_mixers");
+       for( int vidx=0; vidx<zwindows.size(); ++vidx ) {
+               ZWindow *zwindow = zwindows[vidx];
+               if( zwindow->idx < 0 ) continue;
+               Mixer *mixer = edl->mixers.get_mixer(zwindow->idx);
+               if( !mixer || !mixer->mixer_ids.size() ) continue;
+               int k = -1;
+               for( Track *track = edl->tracks->first; k<0 && track!=0; track=track->next ) {
+                       if( track->data_type != TRACK_VIDEO ) continue;
+                       int mixer_id = track->get_mixer_id();
+                       k = mixer->mixer_ids.size();
+                       while( --k >= 0 && mixer_id != mixer->mixer_ids[k] );
+               }
+               if( k < 0 ) continue;
+               EDL *mixer_edl = new EDL(this->edl);
+               mixer_edl->create_objects();
+               mixer_edl->copy_all(edl);
+               mixer_edl->remove_vwindow_edls();
+               for( Track *track = mixer_edl->tracks->first; track!=0; track=track->next ) {
+                       k = mixer->mixer_ids.size();
+                       while( --k >= 0 && track->get_mixer_id() != mixer->mixer_ids[k] );
+                       if( k >= 0 ) {
+                               track->record = 1;
+                               track->play = track->data_type == TRACK_VIDEO ? 1 : 0;
+                       }
+                       else
+                               track->record = track->play = 0;
+               }
+               zwindow->change_source(mixer_edl);
+               zwindow->issue_command(command,
+                       wait_tracking, use_inout, update_refresh, toggle_audio, loop_play);
+       }
+       zwindows_lock->unlock();
+}
+
+void MWindow::refresh_mixers(int dir)
+{
+       int command = dir >= 0 ? CURRENT_FRAME : LAST_FRAME;
+       queue_mixers(edl,command,0,0,1,0,0);
+}
+
+void MWindow::stop_mixers()
+{
+       for( int vidx=0; vidx<zwindows.size(); ++vidx ) {
+               ZWindow *zwindow = zwindows[vidx];
+               if( zwindow->idx < 0 ) continue;
+               zwindow->issue_command(STOP, 0, 0, 0, 0, 0);
+       }
+}
+
+void MWindow::close_mixers(int destroy)
+{
+       zwindows_lock->lock("MWindow::close_mixers");
+       for( int i=zwindows.size(); --i>=0; ) {
+               ZWindow *zwindow = zwindows[i];
+               if( zwindow->idx < 0 ) continue;
+               zwindow->destroy = destroy;
+               ZWindowGUI *zgui = zwindow->zgui;
+               zgui->lock_window("MWindow::select_zwindow 0");
+               zgui->set_done(0);
+               zgui->unlock_window();
+       }
+       zwindows_lock->unlock();
+       for( int i=0; i<zwindows.size(); ++i ) {
+               ZWindow *zwindow = zwindows[i];
+               if( zwindow->idx < 0 ) continue;
+               zwindow->close_window();
+       }
+}
+
+ZWindow *MWindow::create_mixer(Indexable *indexable)
+{
+       ArrayList<Indexable*> new_assets;
+       new_assets.append(indexable);
+       Track *track = edl->tracks->last;
+       load_assets(&new_assets, 0, LOADMODE_NEW_TRACKS, 0, 0, 0, 0, 0, 0);
+       track = !track ? edl->tracks->first : track->next;
+       Mixer *mixer = 0;
+       ZWindow *zwindow = get_mixer(mixer);
+       while( track ) {
+               track->play = track->record = 0;
+               if( track->data_type == TRACK_VIDEO ) {
+                       sprintf(track->title, _("Mixer %d"), zwindow->idx);
+               }
+               mixer->mixer_ids.append(track->get_mixer_id());
+               track = track->next;
+       }
+       if(  indexable->is_asset ) {
+               char *path = indexable->path;
+               char *tp = strrchr(path, '/');
+               if( !tp ) tp = path; else ++tp;
+               zwindow->set_title(tp);
+       }
+       else {
+               char *title = ((EDL*)indexable)->local_session->clip_title;
+               zwindow->set_title(title);
+       }
+       return zwindow;
+}
+
+void MWindow::create_mixers()
+{
+       if( !session->drag_assets->size() &&
+           !session->drag_clips->size() ) return;
+       undo->update_undo_before();
+
+       select_zwindow(0);
+       ArrayList<ZWindow *>new_mixers;
+
+       for( int i=0; i<session->drag_assets->size(); ++i ) {
+               Indexable *indexable = session->drag_assets->get(i);
+               if( !indexable->have_video() ) continue;
+               ZWindow *zwindow = create_mixer(indexable);
+               new_mixers.append(zwindow);
+       }
+       for( int i=0; i<session->drag_clips->size(); ++i ) {
+               Indexable *indexable = (Indexable*)session->drag_clips->get(i);
+               if( !indexable->have_video() ) continue;
+               ZWindow *zwindow = create_mixer(indexable);
+               new_mixers.append(zwindow);
+       }
+
+       tile_mixers();
+       for( int i=0; i<new_mixers.size(); ++i )
+               new_mixers[i]->start();
+
+       refresh_mixers();
+       save_backup();
+       undo->update_undo_after(_("create mixers"), LOAD_ALL);
+       restart_brender();
+       gui->update(1, 2, 1, 1, 1, 1, 0);
+       sync_parameters(CHANGE_ALL);
+}
+
+void MWindow::open_mixers()
+{
+       for( int i=0; i<edl->mixers.size(); ++i ) {
+               Mixer *mixer = edl->mixers[i];
+               ZWindow *zwindow = get_mixer(mixer);
+               zwindow->set_title(mixer->title);
+               zwindow->start();
+       }
+        refresh_mixers();
+}
+
+int MWindow::select_zwindow(ZWindow *zwindow)
+{
+       int ret = 0, n = zwindows.number_of(zwindow);
+       if( session->selected_zwindow != n ) {
+               session->selected_zwindow = n;
+               for( int i=0; i<zwindows.size(); ++i ) {
+                       ZWindow *zwindow = zwindows[i];
+                       if( zwindow->idx < 0 ) continue;
+                       ZWindowGUI *zgui = zwindow->zgui;
+                       zgui->lock_window("MWindow::select_zwindow 0");
+                       zwindow->highlighted = i == n ? 1 : 0;
+                       if( zgui->draw_overlays() )
+                               zgui->canvas->get_canvas()->flash(1);
+                       zgui->unlock_window();
+               }
+               ret = 1;
+               gui->lock_window("MWindow::select_window 1");
+               gui->update_mixers(0, -1);
+               gui->unlock_window();
+       }
+       return ret;
+}
+
+void MWindow::tile_mixers()
+{
+       int nz = 0;
+       for( int i=0; i<zwindows.size(); ++i ) {
+               ZWindow *zwindow = zwindows[i];
+               if( zwindow->idx < 0 ) continue;
+               ++nz;
+       }
+       if( !nz ) return;
+       int zn = ceil(sqrt(nz));
+       int x1 = 1 + gui->get_x(), x2 = cwindow->gui->get_x();
+       int y1 = 1, y2 = gui->get_y();
+       int rw = gui->get_root_w(0), rh = gui->get_root_h(0);
+       if( x1 < 0 ) x1 = 0;
+       if( y1 < 0 ) y1 = 0;
+       if( x2 > rw ) x2 = rw;
+       if( y2 > rh ) y2 = rh;
+       int dx = x2 - x1, dy = y2 - y1;
+       int zw = dx / zn;
+       int lt = BC_DisplayInfo::get_left_border();
+       int top = BC_DisplayInfo::get_top_border();
+       int bw = lt + BC_DisplayInfo::get_right_border();  // borders
+       int bh = top + BC_DisplayInfo::get_bottom_border();
+       int zx = 0, zy = 0;  // window origins
+       int mw = 10+10, mh = 10+10; // canvas margins
+       int rsz = 0, n = 0, dz = 0;
+       int ow = edl->session->output_w, oh = edl->session->output_h;
+       for( int i=0; i<zwindows.size(); ++i ) {
+               ZWindow *zwindow = zwindows[i];
+               if( zwindow->idx < 0 ) continue;
+               int ww = zw - bw, hh = (ww - mw) * oh / ow + mh, zh = hh + bh;
+               if( rsz < hh ) rsz = hh;
+               int xx = zx + x1, yy = zy + y1;
+               int mx = x2 - zw, my = y2 - zh;
+               if( xx > mx ) xx = mx;
+               if( yy > my ) yy = my;
+               xx += lt + dz;  yy += top + dz;
+               zwindow->reposition(xx,yy, ww,hh);
+               if( zwindow->running() ) {
+                       ZWindowGUI *gui = (ZWindowGUI *)zwindow->get_gui();
+                       gui->lock_window("MWindow::tile_mixers");
+                       gui->BC_WindowBase::reposition_window(xx,yy, ww,hh);
+                       gui->unlock_window();
+               }
+               if( ++n >= zn ) {
+                       n = 0;  rsz += bh;
+                       if( (zy += rsz) > (dy - rsz) ) dz += 10;
+                       rsz = 0;
+                       zx = 0;
+               }
+               else
+                       zx += zw;
+       }
+}
+
 void MWindow::init_cache()
 {
        audio_cache = new CICache(preferences);
@@ -1245,19 +1571,14 @@ void MWindow::restart_brender()
 //printf("MWindow::restart_brender 1\n");
        if( !brender_active || !preferences->use_brender ) return;
        if( !brender ) return;
-       int locked  = gui->get_window_lock();
-       if( locked ) gui->unlock_window();
        brender->restart(edl);
-       if( locked ) gui->lock_window("MWindow::restart_brender");
 }
 
 void MWindow::stop_brender()
 {
        if( !brender ) return;
-       int locked  = gui->get_window_lock();
-       if( locked ) gui->unlock_window();
+// cannot be holding mwindow->gui display lock
        brender->stop();
-       if( locked ) gui->lock_window("MWindow::stop_brender");
 }
 
 int MWindow::brender_available(int position)
@@ -1299,7 +1620,9 @@ void MWindow::set_brender_active(int v, int update)
        }
        else {
                edl->session->brender_start = edl->session->brender_end = 0;
+               gui->unlock_window();
                stop_brender();
+               gui->lock_window("MWindow::set_brender_active");
        }
        if( update ) {
                gui->update_timebar(0);
@@ -1309,37 +1632,49 @@ void MWindow::set_brender_active(int v, int update)
 
 int MWindow::has_commercials()
 {
+#ifdef HAVE_COMMERCIAL
        return theme->use_commercials;
+#else
+       return 0;
+#endif
 }
 
 void MWindow::init_commercials()
 {
+#ifdef HAVE_COMMERCIAL
        if( !commercials ) {
                commercials = new Commercials(this);
                commercial_active = 0;
        }
        else
                commercials->add_user();
+#endif
 }
 
 void MWindow::commit_commercial()
 {
+#ifdef HAVE_COMMERCIAL
        if( !commercial_active ) return;
        commercial_active = 0;
        if( !commercials ) return;
        commercials->commitDb();
+#endif
 }
 
 void MWindow::undo_commercial()
 {
+#ifdef HAVE_COMMERCIAL
        if( !commercial_active ) return;
        commercial_active = 0;
        if( !commercials ) return;
        commercials->undoDb();
+#endif
 }
 
 int MWindow::put_commercial()
 {
+       int result = 0;
+#ifdef HAVE_COMMERCIAL
        double start = edl->local_session->get_selectionstart();
        double end = edl->local_session->get_selectionend();
        if( start >= end ) return 0;
@@ -1347,7 +1682,6 @@ int MWindow::put_commercial()
        const char *errmsg = 0;
        int count = 0;
        Tracks *tracks = edl->tracks;
-       int result = 0;
        //check it
        for(Track *track=tracks->first; track && !errmsg; track=track->next) {
                if( track->data_type != TRACK_VIDEO ) continue;
@@ -1400,22 +1734,37 @@ int MWindow::put_commercial()
                undo_commercial();
                result = 1;
        }
+#endif
        return result;
 }
 
 void MWindow::stop_playback(int wait)
 {
-       int locked  = gui->get_window_lock();
-       if( locked ) gui->unlock_window();
+       gui->stop_drawing();
 
-       cwindow->playback_engine->stop_playback();
+       cwindow->stop_playback(wait);
 
        for(int i = 0; i < vwindows.size(); i++) {
                VWindow *vwindow = vwindows[i];
                if( !vwindow->is_running() ) continue;
-               vwindow->playback_engine->stop_playback();
+               vwindow->stop_playback(wait);
+       }
+       for(int i = 0; i < zwindows.size(); i++) {
+               ZWindow *zwindow = zwindows[i];
+               if( zwindow->idx < 0 ) continue;
+               zwindow->stop_playback(wait);
        }
-       if( locked ) gui->lock_window("MWindow::stop_playback");
+}
+
+void MWindow::stop_transport()
+{
+       gui->stop_transport(gui->get_window_lock() ? "MWindow::stop_transport" : 0);
+}
+
+void MWindow::beep(double freq, double secs, double gain)
+{
+       if( !proxy_beep ) proxy_beep = new ProxyBeep(this);
+       proxy_beep->tone(freq, secs, gain);
 }
 
 int MWindow::load_filenames(ArrayList<char*> *filenames,
@@ -1433,7 +1782,9 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 
 // Need to stop playback since tracking depends on the EDL not getting
 // deleted.
+       gui->unlock_window();
        stop_playback(1);
+       gui->lock_window("MWindow::load_filenames 0");
 
 if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
        undo->update_undo_before();
@@ -1443,8 +1794,8 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 
 // Define new_edls and new_assets to load
        int result = 0, ftype = -1;
-       for(int i = 0; i < filenames->size(); i++)
-       {
+
+       for( int i=0; i<filenames->size(); ++i ) {
 // Get type of file
                File *new_file = new File;
                Asset *new_asset = new Asset(filenames->get(i));
@@ -1463,238 +1814,210 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 
                result = 1;
-               switch(ftype)
-               {
+               switch( ftype ) {
 // Convert media file to EDL
-                       case FILE_OK:
+               case FILE_OK:
 // Warn about odd image dimensions
-                               if(new_asset->video_data &&
-                                       ((new_asset->width % 2) ||
-                                       (new_asset->height % 2)))
-                               {
-                                       char string[BCTEXTLEN];
-                                       sprintf(string, _("%s's resolution is %dx%d.\nImages with odd dimensions may not decode properly."),
-                                               new_asset->path,
-                                               new_asset->width,
-                                               new_asset->height);
-                                       MainError::show_error(string);
-                               }
-
-                               if(new_asset->program >= 0 &&
-                                       edl->session->program_no != new_asset->program)
-                               {
-                                       char string[BCTEXTLEN];
-                                       sprintf(string, _("%s's index was built for program number %d\n"
-                                               "Playback preference is %d.\n  Using program %d."),
-                                               new_asset->path, new_asset->program,
-                                               edl->session->program_no, new_asset->program);
-                                       MainError::show_error(string);
-                               }
+                       if( new_asset->video_data &&
+                           ((new_asset->width % 2) || (new_asset->height % 2)) ) {
+                               char string[BCTEXTLEN];
+                               sprintf(string, _("%s's resolution is %dx%d.\nImages with odd dimensions may not decode properly."),
+                                       new_asset->path, new_asset->width, new_asset->height);
+                               MainError::show_error(string);
+                       }
 
+                       if( new_asset->program >= 0 &&
+                           edl->session->program_no != new_asset->program ) {
+                               char string[BCTEXTLEN];
+                               sprintf(string, _("%s's index was built for program number %d\n"
+                                       "Playback preference is %d.\n  Using program %d."),
+                                       new_asset->path, new_asset->program,
+                                       edl->session->program_no, new_asset->program);
+                               MainError::show_error(string);
+                       }
 
-                               if(load_mode != LOADMODE_RESOURCESONLY)
-                               {
-SET_TRACE
-                                       RecordLabels *labels = edl->session->label_cells ?
-                                               new RecordLabels(new_file) : 0;
-SET_TRACE
-                                       asset_to_edl(new_edl, new_asset, labels);
-SET_TRACE
-                                       new_edls.append(new_edl);
-SET_TRACE
-                                       new_asset->Garbage::remove_user();
-                                       delete labels;
-                                       new_asset = 0;
-                               }
-                               else
-                               {
-                                       new_assets.append(new_asset);
-                                       new_asset = 0;
-                               }
+                       if( load_mode != LOADMODE_RESOURCESONLY ) {
+                               RecordLabels *labels = edl->session->label_cells ?
+                                       new RecordLabels(new_file) : 0;
+                               asset_to_edl(new_edl, new_asset, labels);
+                               new_edls.append(new_edl);
+                               new_edl->add_user();
+                               delete labels;
+                       }
+                       else {
+                               new_assets.append(new_asset);
+                               new_asset->add_user();
+                       }
 
 // Set filename to nothing for assets since save EDL would overwrite them.
-                               if(load_mode == LOADMODE_REPLACE ||
-                                       load_mode == LOADMODE_REPLACE_CONCATENATE)
-                               {
-                                       set_filename("");
+                       if( load_mode == LOADMODE_REPLACE ||
+                           load_mode == LOADMODE_REPLACE_CONCATENATE ) {
+                               set_filename("");
 // Reset timeline position
-                                       for(int i = 0; i < TOTAL_PANES; i++)
-                                       {
-                                               new_edl->local_session->view_start[i] = 0;
-                                               new_edl->local_session->track_start[i] = 0;
-                                       }
+                               for( int i=0; i<TOTAL_PANES; ++i ) {
+                                       new_edl->local_session->view_start[i] = 0;
+                                       new_edl->local_session->track_start[i] = 0;
                                }
+                       }
 
-                               result = 0;
-                               break;
+                       result = 0;
+                       break;
 
 // File not found
-                       case FILE_NOT_FOUND:
-                               sprintf(string, _("Failed to open %s"), new_asset->path);
-                               gui->show_message(string, theme->message_error);
-                               gui->update_default_message();
-                               break;
+               case FILE_NOT_FOUND:
+                       sprintf(string, _("Failed to open %s"), new_asset->path);
+                       gui->show_message(string, theme->message_error);
+                       gui->update_default_message();
+                       break;
 
 // Unknown format
-                       case FILE_UNRECOGNIZED_CODEC:
-                       {
+               case FILE_UNRECOGNIZED_CODEC: {
 // Test index file
-                               {       IndexFile indexfile(this, new_asset);
-                                       if( !(result = indexfile.open_index()) )
-                                               indexfile.close_index();
-                               }
+                       { IndexFile indexfile(this, new_asset);
+                       if( !(result = indexfile.open_index()) )
+                               indexfile.close_index(); }
 
 // Test existing EDLs
-                               for(int j = 0; result && j <= new_edls.total; j++) {
-                                       Asset *old_asset = j < new_edls.total ?
-                                               new_edls[j]->assets->get_asset(new_asset->path) :
-                                               edl->assets->get_asset(new_asset->path);
-                                       if( old_asset ) {
-                                               new_asset->copy_from(old_asset,1);
-                                               result = 0;
-                                       }
+                       for( int j=0; result && j<new_edls.total; ++j ) {
+                               Asset *old_asset = new_edls[j]->assets->get_asset(new_asset->path);
+                               if( old_asset ) {
+                                       new_asset->copy_from(old_asset,1);
+                                       result = 0;
                                }
+                       }
+                       if( result ) {
+                               Asset *old_asset = edl->assets->get_asset(new_asset->path);
+                               if( old_asset ) {
+                                       new_asset->copy_from(old_asset,1);
+                                       result = 0;
+                               }
+                       }
 
 // Prompt user
-                               if(result)
-                               {
-                                       char string[BCTEXTLEN];
-                                       FileSystem fs;
-                                       fs.extract_name(string, new_asset->path);
-
-                                       strcat(string, _("'s format couldn't be determined."));
-                                       new_asset->audio_data = 1;
-                                       new_asset->format = FILE_PCM;
-                                       new_asset->channels = defaults->get("AUDIO_CHANNELS", 2);
-                                       new_asset->sample_rate = defaults->get("SAMPLE_RATE", 44100);
-                                       new_asset->bits = defaults->get("AUDIO_BITS", 16);
-                                       new_asset->byte_order = defaults->get("BYTE_ORDER", 1);
-                                       new_asset->signed_ = defaults->get("SIGNED_", 1);
-                                       new_asset->header = defaults->get("HEADER", 0);
-
-                                       FileFormat fwindow(this);
-                                       fwindow.create_objects(new_asset, string);
-                                       result = fwindow.run_window();
-
-
-                                       defaults->update("AUDIO_CHANNELS", new_asset->channels);
-                                       defaults->update("SAMPLE_RATE", new_asset->sample_rate);
-                                       defaults->update("AUDIO_BITS", new_asset->bits);
-                                       defaults->update("BYTE_ORDER", new_asset->byte_order);
-                                       defaults->update("SIGNED_", new_asset->signed_);
-                                       defaults->update("HEADER", new_asset->header);
-                                       save_defaults();
-                               }
+                       if( result ) {
+                               char string[BCTEXTLEN];
+                               FileSystem fs;
+                               fs.extract_name(string, new_asset->path);
+
+                               strcat(string, _("'s format couldn't be determined."));
+                               new_asset->audio_data = 1;
+                               new_asset->format = FILE_PCM;
+                               new_asset->channels = defaults->get("AUDIO_CHANNELS", 2);
+                               new_asset->sample_rate = defaults->get("SAMPLE_RATE", 44100);
+                               new_asset->bits = defaults->get("AUDIO_BITS", 16);
+                               new_asset->byte_order = defaults->get("BYTE_ORDER", 1);
+                               new_asset->signed_ = defaults->get("SIGNED_", 1);
+                               new_asset->header = defaults->get("HEADER", 0);
+
+                               FileFormat fwindow(this);
+                               fwindow.create_objects(new_asset, string);
+                               result = fwindow.run_window();
+
+                               defaults->update("AUDIO_CHANNELS", new_asset->channels);
+                               defaults->update("SAMPLE_RATE", new_asset->sample_rate);
+                               defaults->update("AUDIO_BITS", new_asset->bits);
+                               defaults->update("BYTE_ORDER", new_asset->byte_order);
+                               defaults->update("SIGNED_", new_asset->signed_);
+                               defaults->update("HEADER", new_asset->header);
+                               save_defaults();
+                       }
 
 // Append to list
-                               if(!result)
-                               {
+                       if( !result ) {
 // Recalculate length
-                                       delete new_file;
-                                       new_file = new File;
-                                       result = new_file->open_file(preferences, new_asset, 1, 0);
+                               delete new_file;
+                               new_file = new File;
+                               result = new_file->open_file(preferences, new_asset, 1, 0);
 
-                                       if(load_mode != LOADMODE_RESOURCESONLY)
-                                       {
-                                               RecordLabels *labels = edl->session->label_cells ?
-                                                       new RecordLabels(new_file) : 0;
-                                               asset_to_edl(new_edl, new_asset, labels);
-                                               new_edls.append(new_edl);
-                                               new_asset->Garbage::remove_user();
-                                               delete labels;
-                                               new_asset = 0;
-                                       }
-                                       else
-                                       {
-                                               new_assets.append(new_asset);
-                                               new_asset = 0;
-                                       }
+                               if( load_mode != LOADMODE_RESOURCESONLY ) {
+                                       RecordLabels *labels = edl->session->label_cells ?
+                                               new RecordLabels(new_file) : 0;
+                                       asset_to_edl(new_edl, new_asset, labels);
+                                       new_edls.append(new_edl);
+                                       new_edl->add_user();
+                                       delete labels;
                                }
-                               else
-                               {
-                                       result = 1;
+                               else {
+                                       new_assets.append(new_asset);
+                                       new_asset->add_user();
                                }
-                               break;
                        }
+                       else {
+                               result = 1;
+                       }
+                       break; }
 
-                       case FILE_IS_XML:
-                       {
-                               FileXML xml_file;
+               case FILE_IS_XML: {
+                       FileXML xml_file;
 if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
-                               xml_file.read_from_file(filenames->get(i));
+                       xml_file.read_from_file(filenames->get(i));
 if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
-                               const char *cin_version = 0;
-                               while( !xml_file.read_tag() ) {
-                                       if( xml_file.tag.title_is("EDL") ) {
-                                               cin_version = xml_file.tag.get_property("VERSION");
-                                               break;
-                                       }
-                               }
-                               xml_file.rewind();
-                               if( !cin_version ) {
-                                       eprintf(_("XML file %s\n not from cinelerra."),filenames->get(i));
-                                       char string[BCTEXTLEN];
-                                       sprintf(string,_("Unknown %s"), filenames->get(i));
-                                       gui->show_message(string);
-                                       result = 1;
+                       const char *cin_version = 0;
+                       while( !xml_file.read_tag() ) {
+                               if( xml_file.tag.title_is("EDL") ) {
+                                       cin_version = xml_file.tag.get_property("VERSION");
                                        break;
                                }
-                               if( strcmp(cin_version, CINELERRA_VERSION) ) {
-                                       char string[BCTEXTLEN];
-                                       snprintf(string, sizeof(string),
-                                                _("Warning: XML from cinelerra version %s\n"
-                                               "Session data may be incompatible."), cin_version);
-                                       show_warning(&preferences->warn_version, string);
-                               }
-                               if(load_mode == LOADMODE_NESTED)
-                               {
+                       }
+                       xml_file.rewind();
+                       if( !cin_version ) {
+                               eprintf(_("XML file %s\n not from cinelerra."),filenames->get(i));
+                               char string[BCTEXTLEN];
+                               sprintf(string,_("Unknown %s"), filenames->get(i));
+                               gui->show_message(string);
+                               result = 1;
+                               break;
+                       }
+                       if( strcmp(cin_version, CINELERRA_VERSION) ) {
+                               char string[BCTEXTLEN];
+                               snprintf(string, sizeof(string),
+                                        _("Warning: XML from cinelerra version %s\n"
+                                       "Session data may be incompatible."), cin_version);
+                               show_warning(&preferences->warn_version, string);
+                       }
+                       if( load_mode == LOADMODE_NESTED ) {
 // Load temporary EDL for nesting.
-                                       EDL *nested_edl = new EDL;
-                                       nested_edl->create_objects();
-                                       nested_edl->set_path(filenames->get(i));
-                                       nested_edl->load_xml(&xml_file, LOAD_ALL);
+                               EDL *nested_edl = new EDL;
+                               nested_edl->create_objects();
+                               nested_edl->load_xml(&xml_file, LOAD_ALL);
 //printf("MWindow::load_filenames %p %s\n", nested_edl, nested_edl->project_path);
-                                       edl_to_nested(new_edl, nested_edl);
-                                       nested_edl->Garbage::remove_user();
-                               }
-                               else
-                               {
+                               new_edl->create_nested(nested_edl);
+                               new_edl->set_path(filenames->get(i));
+                               nested_edl->Garbage::remove_user();
+                       }
+                       else {
 // Load EDL for pasting
-                                       new_edl->load_xml(&xml_file, LOAD_ALL);
+                               new_edl->load_xml(&xml_file, LOAD_ALL);
 if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
-                                       test_plugins(new_edl, filenames->get(i));
+                               test_plugins(new_edl, filenames->get(i));
 if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 
-                                       if(load_mode == LOADMODE_REPLACE ||
-                                               load_mode == LOADMODE_REPLACE_CONCATENATE)
-                                       {
-                                               strcpy(session->filename, filenames->get(i));
-                                               strcpy(new_edl->local_session->clip_title,
-                                                       filenames->get(i));
-                                               if(update_filename)
-                                                       set_filename(new_edl->local_session->clip_title);
-                                       }
-                                       else
-                                       if( load_mode == LOADMODE_RESOURCESONLY ) {
-                                               strcpy(new_edl->local_session->clip_title,
-                                                       filenames->get(i));
-                                               struct stat st;
-                                               time_t t = !stat(filenames->get(i),&st) ?
-                                                       st.st_mtime : time(&t);
-                                               ctime_r(&t, new_edl->local_session->clip_notes);
-                                       }
+                               if( load_mode == LOADMODE_REPLACE ||
+                                   load_mode == LOADMODE_REPLACE_CONCATENATE ) {
+                                       strcpy(session->filename, filenames->get(i));
+                                       strcpy(new_edl->local_session->clip_title,
+                                               filenames->get(i));
+                                       if(update_filename)
+                                               set_filename(new_edl->local_session->clip_title);
+                               }
+                               else if( load_mode == LOADMODE_RESOURCESONLY ) {
+                                       strcpy(new_edl->local_session->clip_title,
+                                               filenames->get(i));
+                                       struct stat st;
+                                       time_t t = !stat(filenames->get(i),&st) ?
+                                               st.st_mtime : time(&t);
+                                       ctime_r(&t, new_edl->local_session->clip_notes);
                                }
-
-                               new_edls.append(new_edl);
-                               result = 0;
-                               break;
                        }
+
+                       new_edls.append(new_edl);
+                       new_edl->add_user();
+                       result = 0;
+                       break; }
                }
 
-// edls are in new_edls
-               if( result && new_edl ) new_edl->Garbage::remove_user();
-// assets are copied
-               if( new_asset ) new_asset->Garbage::remove_user();
+               new_edl->Garbage::remove_user();
+               new_asset->Garbage::remove_user();
 
 // Store for testing index
                new_files.append(new_file);
@@ -1743,40 +2066,33 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 
 // Add new assets to EDL and schedule assets for index building.
        int got_indexes = 0;
-       for(int i = 0; i < new_edls.size(); i++)
-       {
+       for( int i=0; i<new_edls.size(); ++i ) {
                EDL *new_edl = new_edls[i];
-               for(int j = 0; j < new_edl->nested_edls->size(); j++)
-               {
-                       mainindexes->add_next_asset(0,
-                               new_edl->nested_edls->get(j));
+               for( int j=0; j<new_edl->nested_edls.size(); ++j ) {
+                       mainindexes->add_next_asset(0, new_edl->nested_edls[j]);
+                       edl->nested_edls.update_index(new_edl->nested_edls[j]);
                        got_indexes = 1;
-                       edl->nested_edls->update_index(new_edl->nested_edls->get(j));
                }
 
        }
 
 if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
-       for(int i = 0; i < new_assets.size(); i++)
-       {
+       for( int i=0; i<new_assets.size(); ++i ) {
                Asset *new_asset = new_assets[i];
 
                File *new_file = 0;
                int got_it = 0;
-               for(int j = 0; j < new_files.size(); j++)
-               {
+               for( int j=0; j<new_files.size(); ++j ) {
                        new_file = new_files[j];
-                       if(!strcmp(new_file->asset->path,
-                               new_asset->path))
-                       {
+                       if( !strcmp(new_file->asset->path, new_asset->path) ) {
                                got_it = 1;
                                break;
                        }
                }
 
                mainindexes->add_next_asset(got_it ? new_file : 0, new_asset);
-               got_indexes = 1;
                edl->assets->update(new_asset);
+               got_indexes = 1;
        }
 if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 
@@ -1817,8 +2133,12 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
            ( load_mode == LOADMODE_REPLACE ||
              load_mode == LOADMODE_REPLACE_CONCATENATE ) ) {
                select_asset(0, 0);
+               edl->session->proxy_scale = 1;
+               edl->session->proxy_use_scaler = 0;
+               edl->session->proxy_auto_scale = 0;
+               edl->session->proxy_beep = 0;
                edl->local_session->preview_start = 0;
-               edl->local_session->preview_end = edl->tracks->total_playable_length();
+               edl->local_session->preview_end = 0;
                edl->local_session->loop_playback = 0;
                edl->local_session->set_selectionstart(0);
                edl->local_session->set_selectionend(0);
@@ -1827,6 +2147,35 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
                goto_start();
        }
 
+       if( ( edl->session->proxy_auto_scale && edl->session->proxy_scale != 1 ) &&
+           ( load_mode != LOADMODE_REPLACE && load_mode != LOADMODE_REPLACE_CONCATENATE ) ) {
+               ArrayList<Indexable *> orig_idxbls;
+               for( int i=0; i<new_assets.size(); ++i )
+                       orig_idxbls.append(new_assets.get(i));
+               for( int i=0; i<new_edls.size(); ++i ) {
+                       EDL *new_edl = new_edls[i];
+                       for( Track *track=new_edl->tracks->first; track; track=track->next ) {
+                               if( track->data_type != TRACK_VIDEO ) continue;
+                               for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
+                                       Indexable *idxbl = (Indexable *)edit->asset;
+                                       if( !idxbl ) continue;
+                                       if( !idxbl->have_video() ) continue;
+                                       if( edit->channel != 0 ) continue; // first layer only
+                                       orig_idxbls.append(edit->asset);
+                               }
+                       }
+               }
+               gui->unlock_window(); // to update progress bar
+               int ret = render_proxy(orig_idxbls);
+               gui->lock_window("MWindow::load_filenames");
+               if( ret >= 0 && edl->session->proxy_beep ) {
+                       if( ret > 0 )
+                               beep(2000., 1.5, 0.5);
+                       else
+                               beep(4000., 0.25, 0.5);
+               }
+       }
+
 // need to update undo before project, since mwindow is unlocked & a new load
 // can begin here.  Should really prevent loading until we're done.
 if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
@@ -1871,113 +2220,109 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
        return 0;
 }
 
+int MWindow::render_proxy(ArrayList<Indexable *> &new_idxbls)
+{
+       Asset *format_asset = new Asset;
+       format_asset->format = FILE_FFMPEG;
+       format_asset->load_defaults(defaults, "PROXY_", 1, 1, 0, 0, 0);
+       ProxyRender proxy_render(this, format_asset);
+       int new_scale = edl->session->proxy_scale;
+       int use_scaler = edl->session->proxy_use_scaler;
+
+       for( int i=0; i<new_idxbls.size(); ++i ) {
+               Indexable *orig = new_idxbls.get(i);
+               Asset *proxy = proxy_render.add_original(orig, new_scale);
+               if( !proxy ) continue;
+               FileSystem fs;
+               int exists = fs.get_size(proxy->path) > 0 ? 1 : 0;
+               int got_it = exists && // if proxy exists, and is newer than orig
+                   fs.get_date(proxy->path) > fs.get_date(orig->path) ? 1 : 0;
+               if( got_it ) continue;
+               proxy_render.add_needed(orig, proxy);
+       }
 
-
+// render needed proxies
+       int result = proxy_render.create_needed_proxies(new_scale);
+       if( !result ) {
+               add_proxy(use_scaler,
+                       &proxy_render.orig_idxbls, &proxy_render.orig_proxies);
+       }
+       format_asset->remove_user();
+       return !result ? proxy_render.needed_proxies.size() : -1;
+}
 
 void MWindow::test_plugins(EDL *new_edl, char *path)
 {
        char string[BCTEXTLEN];
 
-// Do a check weather plugins exist
-       for(Track *track = new_edl->tracks->first; track; track = track->next)
-       {
-               for(int k = 0; k < track->plugin_set.total; k++)
-               {
+// Do a check whether plugins exist
+       for( Track *track=new_edl->tracks->first; track; track=track->next ) {
+               for( int k=0; k<track->plugin_set.total; ++k ) {
                        PluginSet *plugin_set = track->plugin_set[k];
-                       for(Plugin *plugin = (Plugin*)plugin_set->first;
-                               plugin;
-                               plugin = (Plugin*)plugin->next)
-                       {
-                               if(plugin->plugin_type == PLUGIN_STANDALONE)
-                               {
+                       for( Plugin *plugin = (Plugin*)plugin_set->first;
+                                       plugin; plugin = (Plugin*)plugin->next ) {
+                               if( plugin->plugin_type != PLUGIN_STANDALONE ) continue;
 // ok we need to find it in plugindb
-                                       int plugin_found = 0;
-
-                                       for(int j = 0; j < plugindb->size(); j++)
-                                       {
-                                               PluginServer *server = plugindb->get(j);
-                                               if(server->title &&
-                                                       !strcasecmp(server->title, plugin->title) &&
-                                                       ((track->data_type == TRACK_AUDIO && server->audio) ||
-                                                       (track->data_type == TRACK_VIDEO && server->video)) &&
-                                                       (!server->transition))
-                                                       plugin_found = 1;
-                                       }
-
-                                       if (!plugin_found)
-                                       {
-                                               sprintf(string,
+                               PluginServer *server =
+                                       scan_plugindb(plugin->title, track->data_type);
+                               if( !server || server->transition ) {
+                                       sprintf(string,
        _("The %s '%s' in file '%s' is not part of your installation of Cinelerra.\n"
          "The project won't be rendered as it was meant and Cinelerra might crash.\n"),
-                                                       "effect", plugin->title,
-                                                       path);
-                                               MainError::show_error(string);
-                                       }
+                                               "effect", _(plugin->title), path);
+                                       MainError::show_error(string);
                                }
                        }
                }
 
-               for(Edit *edit = (Edit*)track->edits->first;
-                       edit;
-                       edit = (Edit*)edit->next)
-               {
-                       if (edit->transition)
-                       {
+               for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
+                       if( !edit->transition ) continue;
 // ok we need to find transition in plugindb
-
-                               int transition_found = 0;
-                               for(int j = 0; j < plugindb->size(); j++)
-                               {
-                                       PluginServer *server = plugindb->get(j);
-                                       if(server->title &&
-                                               !strcasecmp(server->title, edit->transition->title) &&
-                                               ((track->data_type == TRACK_AUDIO && server->audio) ||
-                                               (track->data_type == TRACK_VIDEO && server->video)) &&
-                                               (server->transition))
-                                               transition_found = 1;
-                               }
-
-                               if (!transition_found)
-                               {
-                                       sprintf(string,
+                       PluginServer *server =
+                               scan_plugindb(edit->transition->title, track->data_type);
+                       if( !server || !server->transition ) {
+                               sprintf(string,
        _("The %s '%s' in file '%s' is not part of your installation of Cinelerra.\n"
          "The project won't be rendered as it was meant and Cinelerra might crash.\n"),
-                                               "transition", edit->transition->title,
-                                               path);
-                                       MainError::show_error(string);
-                               }
+                                       "transition", _(edit->transition->title), path);
+                               MainError::show_error(string);
                        }
                }
        }
 }
 
 
-void MWindow::init_shm()
+void MWindow::init_shm(const char *pfn, int64_t min)
 {
+       int64_t result = 0;
 // Fix shared memory
-       FILE *fd = fopen("/proc/sys/kernel/shmmax", "w");
-       if(fd) {
-               fprintf(fd, "0x7fffffff");
+       FILE *fd = fopen(pfn, "r");
+       if( fd ) {
+               fscanf(fd, "%jd", &result);
                fclose(fd);
+               if( result >= min ) return;
        }
-       fd = 0;
 
-       fd = fopen("/proc/sys/kernel/shmmax", "r");
-       if(!fd) {
-               MainError::show_error("MWindow::init_shm: couldn't open /proc/sys/kernel/shmmax for reading.\n");
+       fd = fopen(pfn, "w");
+       if( !fd ) return;
+       fprintf(fd, "0x%jx", min);
+       fclose(fd);
+
+       fd = fopen(pfn, "r");
+       if( !fd ) {
+               eprintf(_("MWindow::init_shm: couldn't open %s for reading.\n"), pfn);
                return;
        }
 
-       int64_t result = 0;
        fscanf(fd, "%jd", &result);
        fclose(fd);
-       fd = 0;
-       if(result < 0x7fffffff) {
-               eprintf(_("MWindow::init_shm: /proc/sys/kernel/shmmax is %p.\n"
+       if( result < min ) {
+               eprintf(_("MWindow::init_shm: %s is %p.\n"
                        "you probably need to be root, or:\n"
-                       "as root, run: echo 0x7fffffff > /proc/sys/kernel/shmmax\n"
+                       "as root, run: echo 0x%jx > %s\n"
                        "before trying to start cinelerra.\n"
-                       "It should be at least 0x7fffffff for Cinelerra.\n"), (void *)result);
+                       "It should be at least 0x%jx for Cinelerra.\n"),
+                       pfn, (void *)result, min, pfn, min);
        }
 }
 
@@ -1985,7 +2330,6 @@ void MWindow::create_objects(int want_gui,
        int want_new,
        char *config_path)
 {
-       FileSystem fs;
        const int debug = 0;
        if(debug) PRINT_TRACE
 
@@ -2026,9 +2370,6 @@ void MWindow::create_objects(int want_gui,
        BC_Resources::init_fontconfig(string);
        if(debug) PRINT_TRACE
 
-// Initialize before too much else is running
-// Preferences & theme are required for building MPEG table of contents
-
 // Default project created here
        init_edl();
        if(debug) PRINT_TRACE
@@ -2163,7 +2504,8 @@ void MWindow::create_objects(int want_gui,
                &MWindowGUI::keyboard_listener);
 
        hide_splash();
-       init_shm();
+       init_shm("/proc/sys/kernel/shmmax", 0x7fffffff);
+       init_shm("/proc/sys/kernel/shmmni", 0x4000);
        if(debug) PRINT_TRACE
 
        BC_WindowBase::get_resources()->vframe_shm = 1;
@@ -2453,10 +2795,7 @@ void MWindow::sync_parameters(int change_type)
        }
        else
        {
-               cwindow->playback_engine->que->send_command(CURRENT_FRAME,
-                                                       change_type,
-                                                       edl,
-                                                       1);
+               cwindow->refresh_frame(change_type);
        }
 }
 
@@ -2566,12 +2905,11 @@ SET_TRACE
 SET_TRACE
 
 //printf("MWindow::show_plugin 1\n");
-       if(!done)
-       {
-               if(!plugin->track)
-               {
-                       printf("MWindow::show_plugin track not defined.\n");
-               }
+       if( !done && !plugin->track ) {
+               printf("MWindow::show_plugin track not defined.\n");
+               done = 1;
+       }
+       if( !done ) {
                PluginServer *server = scan_plugindb(plugin->title,
                        plugin->track->data_type);
 
@@ -2911,38 +3249,6 @@ if(debug) printf("MWindow::asset_to_edl %d\n", __LINE__);
        return 0;
 }
 
-int MWindow::edl_to_nested(EDL *new_edl,
-       EDL *nested_edl)
-{
-
-// Keep frame rate, sample rate, and output size unchanged.
-// These parameters would revert the project if VWindow displayed an asset
-// of different size than the project.
-
-
-
-// Nest all video & audio outputs
-       new_edl->session->video_tracks = 1;
-       new_edl->session->audio_tracks = nested_edl->session->audio_channels;
-       new_edl->create_default_tracks();
-
-
-
-       new_edl->insert_asset(0,
-               nested_edl,
-               0,
-               0,
-               0);
-
-       char string[BCTEXTLEN];
-       FileSystem fs;
-       fs.extract_name(string, nested_edl->path);
-//printf("MWindow::edl_to_nested %p %s\n", nested_edl, nested_edl->path);
-
-       strcpy(new_edl->local_session->clip_title, string);
-
-       return 0;
-}
 
 // Reset everything after a load.
 void MWindow::update_project(int load_mode)
@@ -2950,7 +3256,6 @@ void MWindow::update_project(int load_mode)
        const int debug = 0;
 
        if(debug) PRINT_TRACE
-       init_brender();
        edl->tracks->update_y_pixels(theme);
 
        if(debug) PRINT_TRACE
@@ -2964,6 +3269,7 @@ void MWindow::update_project(int load_mode)
        gui->update(1, 1, 1, 1, 1, 1, 1);
        if(debug) PRINT_TRACE
        gui->unlock_window();
+       init_brender();
 
        cwindow->gui->lock_window("MWindow::update_project 1");
        cwindow->update(0, 0, 1, 1, 1);
@@ -2972,8 +3278,8 @@ void MWindow::update_project(int load_mode)
        if(debug) PRINT_TRACE
 
 // Close all the vwindows
-       if(load_mode == LOADMODE_REPLACE ||
-               load_mode == LOADMODE_REPLACE_CONCATENATE) {
+       if( load_mode == LOADMODE_REPLACE ||
+           load_mode == LOADMODE_REPLACE_CONCATENATE ) {
                if(debug) PRINT_TRACE
                int first_vwindow = 0;
                if(session->show_vwindow) first_vwindow = 1;
@@ -2990,14 +3296,29 @@ void MWindow::update_project(int load_mode)
                        if( !vwindow->is_running() ) continue;
                        vwindow->close_window();
                }
+               for( int i=0; i<edl->vwindow_edls.size(); ++i ) {
+                       VWindow *vwindow = get_viewer(1, -1);
+                       vwindow->change_source(i);
+               }
                if(debug) PRINT_TRACE
+               select_zwindow(0);
+               close_mixers(0);
+
+               for( int i=0; i<edl->mixers.size(); ++i ) {
+                       Mixer *mixer = edl->mixers[i];
+                       ZWindow *zwindow = get_mixer(mixer);
+                       zwindow->set_title(mixer->title);
+                       zwindow->start();
+               }
        }
-       else if(vwindows.size()) {
-               VWindow *vwindow = vwindows[DEFAULT_VWINDOW];
-               if( vwindow->is_running() ) {
-                       vwindow->gui->lock_window("MWindow::update_project");
-                       vwindow->update(1);
-                       vwindow->gui->unlock_window();
+       else {
+               if(vwindows.size()) {
+                       VWindow *vwindow = vwindows[DEFAULT_VWINDOW];
+                       if( vwindow->is_running() ) {
+                               vwindow->gui->lock_window("MWindow::update_project");
+                               vwindow->update(1);
+                               vwindow->gui->unlock_window();
+                       }
                }
        }
 
@@ -3007,15 +3328,13 @@ void MWindow::update_project(int load_mode)
        cwindow->gui->unlock_window();
 
        if(debug) PRINT_TRACE
-       cwindow->playback_engine->que->send_command(CURRENT_FRAME,
-               CHANGE_ALL,
-               edl,
-               1);
+       cwindow->refresh_frame(CHANGE_ALL);
 
        awindow->gui->async_update_assets();
        if(debug) PRINT_TRACE
 
        gui->lock_window("MWindow::update_project");
+       gui->update_mixers(0, 0);
        gui->flush();
        if(debug) PRINT_TRACE
 }
@@ -3047,6 +3366,7 @@ void MWindow::rebuild_indices()
                                asset->reset_audio();
                        }
                        asset->reset_video();
+                       remove_asset_from_caches(asset);
 //                     File file; // re-probe the asset
 //                     file.open_file(preferences, asset, 1, 0);
                }
@@ -3061,10 +3381,13 @@ void MWindow::save_backup()
        FileXML file;
        edl->optimize();
        edl->set_path(session->filename);
-       char backup_path[BCTEXTLEN];
+       char backup_path[BCTEXTLEN], backup_path1[BCTEXTLEN];
        snprintf(backup_path, sizeof(backup_path), "%s/%s",
                File::get_config_path(), BACKUP_FILE);
-       edl->save_xml(&file, backup_path, 0, 0);
+       snprintf(backup_path1, sizeof(backup_path1), "%s/%s",
+               File::get_config_path(), BACKUP_FILE1);
+       rename(backup_path, backup_path1);
+       edl->save_xml(&file, backup_path);
        file.terminate_string();
        FileSystem fs;
        fs.complete_path(backup_path);
@@ -3100,6 +3423,29 @@ void MWindow::load_backup()
        save_backup();
 }
 
+
+void MWindow::save_undo_data()
+{
+       char perpetual_path[BCTEXTLEN];
+       snprintf(perpetual_path, sizeof(perpetual_path), "%s/%s",
+               File::get_config_path(), PERPETUAL_FILE);
+       FILE *fp = fopen(perpetual_path,"w");
+       if( !fp ) return;
+       undo->save(fp);
+       fclose(fp);
+}
+
+void MWindow::load_undo_data()
+{
+       char perpetual_path[BCTEXTLEN];
+       snprintf(perpetual_path, sizeof(perpetual_path), "%s/%s",
+               File::get_config_path(), PERPETUAL_FILE);
+       FILE *fp = fopen(perpetual_path,"r");
+       if( !fp ) return;
+       undo->load(fp);
+       fclose(fp);
+}
+
 static inline int gcd(int m, int n)
 {
        int r;
@@ -3152,25 +3498,25 @@ void MWindow::reset_caches()
        wave_cache->remove_all();
        audio_cache->remove_all();
        video_cache->remove_all();
-       if( cwindow->playback_engine && cwindow->playback_engine->audio_cache )
-               cwindow->playback_engine->audio_cache->remove_all();
-       if( cwindow->playback_engine && cwindow->playback_engine->video_cache )
-               cwindow->playback_engine->video_cache->remove_all();
-
+       if( cwindow->playback_engine ) {
+               if( cwindow->playback_engine->audio_cache )
+                       cwindow->playback_engine->audio_cache->remove_all();
+               if( cwindow->playback_engine->video_cache )
+                       cwindow->playback_engine->video_cache->remove_all();
+       }
        for(int i = 0; i < vwindows.size(); i++) {
                VWindow *vwindow = vwindows[i];
                if( !vwindow->is_running() ) continue;
-               if(vwindow->playback_engine && vwindow->playback_engine->audio_cache)
+               if( !vwindow->playback_engine ) continue;
+               if( vwindow->playback_engine->audio_cache )
                        vwindow->playback_engine->audio_cache->remove_all();
-               if(vwindow->playback_engine && vwindow->playback_engine->video_cache)
+               if( vwindow->playback_engine->video_cache )
                        vwindow->playback_engine->video_cache->remove_all();
        }
 }
 
 void MWindow::remove_asset_from_caches(Asset *asset)
 {
-       gui->resource_thread->get_video_source(0);
-       gui->resource_thread->get_audio_source(0);
        frame_cache->remove_asset(asset);
        wave_cache->remove_asset(asset);
        audio_cache->delete_entry(asset);
@@ -3182,9 +3528,10 @@ void MWindow::remove_asset_from_caches(Asset *asset)
        for(int i = 0; i < vwindows.size(); i++) {
                VWindow *vwindow = vwindows[i];
                if( !vwindow->is_running() ) continue;
-               if(vwindow->playback_engine && vwindow->playback_engine->audio_cache)
+               if( !vwindow->playback_engine ) continue;
+               if( vwindow->playback_engine->audio_cache )
                        vwindow->playback_engine->audio_cache->delete_entry(asset);
-               if(vwindow->playback_engine && vwindow->playback_engine->video_cache)
+               if( vwindow->playback_engine->video_cache )
                        vwindow->playback_engine->video_cache->delete_entry(asset);
        }
 }
@@ -3312,7 +3659,8 @@ void MWindow::dump_exe(FILE *fp)
        char mtime[256];
        strftime(mtime, sizeof(mtime), "%F %T", tm);
        fprintf(fp,"mtime: %s\n", mtime);
-
+#if 0
+// people hit ctl-c waiting for this
        int fd = open(proc_path,O_RDONLY+O_NONBLOCK);
        if( fd < 0 ) { fprintf(fp,"open: %m\n"); return; }
        uint8_t *bfr = 0;
@@ -3337,6 +3685,7 @@ void MWindow::dump_exe(FILE *fp)
        for( int i=0; i<20; ++i ) fprintf(fp, "%02x", digest[i]);
        if( ret < 0 ) fprintf(fp, " (ret %d)", ret);
        if( pos < st.st_size ) fprintf(fp, " (pos %jd)", pos);
+#endif
        fprintf(fp, "\n");
 }
 
@@ -3349,7 +3698,7 @@ void MWindow::trap_hook(FILE *fp, void *vp)
        mwindow->dump_edl(fp);
        fprintf(fp, "\nUNDO:\n");
        mwindow->dump_undo(fp);
-       fprintf(fp, "\nEXE:\n");
+       fprintf(fp, "\nEXE: %s\n", AboutPrefs::build_timestamp);
        mwindow->dump_exe(fp);
 }
 
@@ -3615,7 +3964,8 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra
        int result = file->open_file(preferences, asset, 1, 0);
        if( !result && delete_tracks > 0 )
                undo->update_undo_before();
-       if( !result && asset->video_data && asset->get_video_layers() > 0 ) {
+       int video_layers = asset->get_video_layers();
+       if( !result && asset->video_data && vstream < video_layers ) {
                // try to get asset up to date, may fail
                file->select_video_stream(asset, vstream);
                // either way use what was/is there.
@@ -3671,7 +4021,7 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra
        if( !result && asset->audio_data && asset->channels > 0 ) {
                session->sample_rate = asset->get_sample_rate();
                int64_t channel_mask = 0;
-               int astrm = !asset->video_data ? -1 :
+               int astrm = !asset->video_data || vstream >= video_layers ? -1 :
                        file->get_audio_for_video(vstream, astream, channel_mask);
                if( astrm >= 0 ) file->select_audio_stream(asset, astrm);
                if( astrm < 0 || !channel_mask ) channel_mask = (1<<asset->channels)-1;
@@ -3680,29 +4030,9 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra
                if( channels < 1 ) channels = 1;
                if( channels > 6 ) channels = 6;
                session->audio_tracks = session->audio_channels = channels;
-               switch( channels ) {
-               case 6:
-                       session->achannel_positions[0] = 90;
-                       session->achannel_positions[1] = 150;
-                       session->achannel_positions[2] = 30;
-                       session->achannel_positions[3] = 210;
-                       session->achannel_positions[4] = 330;
-                       session->achannel_positions[5] = 270;
-                       break;
-               case 2:
-                       session->achannel_positions[0] = 180;
-                       session->achannel_positions[1] = 0;
-                       break;
-               case 1:
-                       session->achannel_positions[1] = 90;
-                       break;
-               default: {
-                       if( !channels ) break;
-                       double t = 0, dt = 360./channels;
-                       for( int i=channels; --i>=0; t+=dt )
-                               session->achannel_positions[i] = int(t+0.5);
-                       break; }
-               }
+
+               int *achannel_positions = preferences->channel_positions[session->audio_channels-1];
+               memcpy(&session->achannel_positions, achannel_positions, sizeof(session->achannel_positions));
                remap_audio(MWindow::AUDIO_1_TO_1);
 
                if( delete_tracks ) {
@@ -3785,4 +4115,19 @@ PanAuto* MWindow::get_pan_auto(PatchGUI *patch)
        return (PanAuto*)ptr->get_prev_auto( (long)unit_position, PLAY_FORWARD, current);
 }
 
+PatchGUI *MWindow::get_patchgui(Track *track)
+{
+       PatchGUI *patchgui = 0;
+       TimelinePane **panes = gui->pane;
+        for( int i=0; i<TOTAL_PANES && !patchgui; ++i ) {
+                if( !panes[i] ) continue;
+                PatchBay *patchbay = panes[i]->patchbay;
+                if( !patchbay ) continue;
+                for( int j=0; j<patchbay->patches.total && !patchgui; ++j ) {
+                        if( patchbay->patches.values[j]->track == track )
+                                patchgui = patchbay->patches.values[j];
+                }
+        }
+        return patchgui;
+}