improve delays created by vicon drawing locks, reset_cache segv fix, gang track toolt...
[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / bdcreate.C
index 27f728ad6dc80c1a21d20723d5eec697edf30a34..93794d516f842acea5469b703e9f36b3c1170afc 100644 (file)
@@ -10,7 +10,6 @@
 #include "filexml.h"
 #include "interlacemodes.h"
 #include "keyframe.h"
-#include "labels.h"
 #include "mainerror.h"
 #include "mainundo.h"
 #include "mwindow.h"
@@ -42,9 +41,10 @@ static struct bd_format {
 } bd_formats[] = {
 // framerates are frames, not fields, per second, *=not standard
        { "1920x1080 29.97i",   1920,1080, 29.97,  1, ILACE_MODE_TOP_FIRST },
-       { "1920x1080 29.97p*",  1920,1080, 29.97,  1, ILACE_MODE_NOTINTERLACED },
+       { "1920x1080 29.97p*",  1920,1080, 29.97,  1, ILACE_MODE_FAKE_INTERLACE },
        { "1920x1080 24p",      1920,1080, 24.,    1, ILACE_MODE_NOTINTERLACED },
        { "1920x1080 25i",      1920,1080, 25.,    1, ILACE_MODE_TOP_FIRST },
+       { "1920x1080 25p*",     1920,1080, 25.,    1, ILACE_MODE_FAKE_INTERLACE },
        { "1920x1080 23.976p",  1920,1080, 23.976, 1, ILACE_MODE_NOTINTERLACED },
        { "1440x1080 29.97i",   1440,1080, 29.97, -1, ILACE_MODE_TOP_FIRST },
        { "1440x1080 25i",      1440,1080, 25.,   -1, ILACE_MODE_TOP_FIRST },
@@ -52,6 +52,8 @@ static struct bd_format {
        { "1440x1080 23.976p",  1440,1080, 23.976,-1, ILACE_MODE_NOTINTERLACED },
        { "1280x720  59.94p",   1280,720,  59.94,  1, ILACE_MODE_NOTINTERLACED },
        { "1280x720  50p",      1280,720,  50.,    1, ILACE_MODE_NOTINTERLACED },
+       { "1280x720  29.97p*",  1280,720,  29.97,  1, ILACE_MODE_NOTINTERLACED },
+       { "1280x720  25p*",     1280,720,  25.,    1, ILACE_MODE_NOTINTERLACED },
        { "1280x720  24p",      1280,720,  24.,    1, ILACE_MODE_NOTINTERLACED },
        { "1280x720  23.976p",  1280,720,  23.976, 1, ILACE_MODE_NOTINTERLACED },
        { "720x576   25i",       720,576,  25.,    0, ILACE_MODE_BOTTOM_FIRST },
@@ -78,9 +80,10 @@ const double CreateBD_Thread::BD_KAUDIO_RATE = 192;
 const int CreateBD_Thread::BD_INTERLACE_MODE = ILACE_MODE_NOTINTERLACED;
 
 CreateBD_MenuItem::CreateBD_MenuItem(MWindow *mwindow)
- : BC_MenuItem(_("BD Render..."), _("Ctrl-d"), 'd')
+ : BC_MenuItem(_("BD Render..."), _("Ctrl-Shift-D"), 'D')
 {
        set_ctrl(1);
+       set_shift(1);
        this->mwindow = mwindow;
 }
 
@@ -90,44 +93,18 @@ int CreateBD_MenuItem::handle_event()
        return 1;
 }
 
-
-CreateBD_Thread::CreateBD_Thread(MWindow *mwindow)
- : BC_DialogThread()
-{
-       this->mwindow = mwindow;
-       this->gui = 0;
-       this->use_deinterlace = 0;
-       this->use_scale = Rescale::none;
-       this->use_histogram = 0;
-       this->use_inverse_telecine = 0;
-       this->use_wide_audio = 0;
-       this->use_resize_tracks = 0;
-       this->use_label_chapters = 0;
-
-       this->bd_size = BD_SIZE;
-       this->bd_width = BD_WIDTH;
-       this->bd_height = BD_HEIGHT;
-       this->bd_aspect_width = BD_WIDE_ASPECT_WIDTH;
-       this->bd_aspect_height = BD_WIDE_ASPECT_HEIGHT;
-       this->bd_framerate = BD_FRAMERATE;
-       this->bd_samplerate = BD_SAMPLERATE;
-       this->bd_max_bitrate = BD_MAX_BITRATE;
-       this->bd_kaudio_rate = BD_KAUDIO_RATE;
-       this->max_w = this->max_h = 0;
-}
-
-CreateBD_Thread::~CreateBD_Thread()
+BD_BatchRenderJob::BD_BatchRenderJob(Preferences *preferences, int labeled, int farmed)
+ : BatchRenderJob("BD_JOB", preferences, labeled, farmed)
 {
-       close_window();
 }
 
-int CreateBD_Thread::get_udfs_mount(char *udfs, char *mopts, char *mntpt)
+int BD_BatchRenderJob::get_udfs_mount(char *udfs, char *mopts, char *mntpt)
 {
        int ret = 0;
-// default: mount -t udf -o loop $1/bd.udfs $1/udfs
-       strcpy(udfs,"$1/bd.udfs");
-       strcpy(mopts,"-t udf -o loop $1/bd.udfs ");
-       strcpy(mntpt,"$1/udfs");
+// default: mount -t udf -o loop $dir/bd.udfs $dir/udfs
+       strcpy(udfs,"$dir/bd.udfs");
+       strcpy(mopts,"-t udf -o loop $dir/bd.udfs ");
+       strcpy(mntpt,"$dir/udfs");
        const char *home = getenv("HOME");
        if( !home ) return ret;
        FILE *fp = fopen("/etc/fstab","r");
@@ -167,6 +144,84 @@ int CreateBD_Thread::get_udfs_mount(char *udfs, char *mopts, char *mntpt)
        return ret;
 }
 
+char *BD_BatchRenderJob::create_script(EDL *edl, ArrayList<Indexable *> *idxbls)
+{
+       char script[BCTEXTLEN];
+       strcpy(script, edl_path);
+       FILE *fp = 0;
+       char *bp = strrchr(script,'/');
+       int fd = -1;
+       if( bp ) {
+               strcpy(bp, "/bd.sh");
+               fd = open(script, O_WRONLY+O_CREAT+O_TRUNC, 0755);
+       }
+       if( fd >= 0 )
+               fp = fdopen(fd, "w");
+       if( !fp ) {
+               char err[BCTEXTLEN], msg[BCTEXTLEN];
+               strerror_r(errno, err, sizeof(err));
+               sprintf(msg, _("Unable to save: %s\n-- %s"), script, err);
+               MainError::show_error(msg);
+               return 0;
+       }
+       char udfs[BCTEXTLEN], mopts[BCTEXTLEN], mntpt[BCTEXTLEN];
+       int is_usr_mnt = get_udfs_mount(udfs, mopts, mntpt);
+       const char *exec_path = File::get_cinlib_path();
+       fprintf(fp,"#!/bin/bash -ex\n");
+       fprintf(fp,"sdir=`dirname $0`\n");
+       fprintf(fp,"dir=`cd \"$sdir\"; pwd`\n");
+       fprintf(fp,"PATH=$PATH:%s\n",exec_path);
+       fprintf(fp,"mkdir -p $dir/udfs\n");
+       fprintf(fp,"sz=`du -cb $dir/bd.m2ts* | tail -1 | sed -e 's/[    ].*//'`\n");
+       fprintf(fp,"blks=$((sz/2048 + 4096))\n");
+       fprintf(fp,"rm -f %s\n", udfs);
+       fprintf(fp,"mkudffs -b 2048 %s $blks\n", udfs);
+       fprintf(fp,"mount %s%s\n", mopts, mntpt);
+       fprintf(fp,"bdwrite %s $dir/bd.m2ts*\n",mntpt);
+       fprintf(fp,"umount %s\n",mntpt);
+       if( is_usr_mnt )
+               fprintf(fp,"mv -f %s $dir/bd.udfs\n", udfs);
+       fprintf(fp,"echo To burn bluray, load writable media and run:\n");
+       fprintf(fp,"echo for WORM: growisofs -dvd-compat -Z /dev/bd=$dir/bd.udfs\n");
+       fprintf(fp,"echo for RW:   dd if=$dir/bd.udfs of=/dev/bd bs=2048000\n");
+       fprintf(fp,"kill $$\n");
+       fprintf(fp,"\n");
+       fclose(fp);
+       return cstrdup(script);
+}
+
+
+CreateBD_Thread::CreateBD_Thread(MWindow *mwindow)
+ : BC_DialogThread()
+{
+       this->mwindow = mwindow;
+       this->gui = 0;
+       this->use_deinterlace = 0;
+       this->use_scale = Rescale::none;
+       this->use_histogram = 0;
+       this->use_inverse_telecine = 0;
+       this->use_wide_audio = 0;
+       this->use_resize_tracks = 0;
+       this->use_labeled = 0;
+       this->use_farmed = 0;
+
+       this->bd_size = BD_SIZE;
+       this->bd_width = BD_WIDTH;
+       this->bd_height = BD_HEIGHT;
+       this->bd_aspect_width = BD_WIDE_ASPECT_WIDTH;
+       this->bd_aspect_height = BD_WIDE_ASPECT_HEIGHT;
+       this->bd_framerate = BD_FRAMERATE;
+       this->bd_samplerate = BD_SAMPLERATE;
+       this->bd_max_bitrate = BD_MAX_BITRATE;
+       this->bd_kaudio_rate = BD_KAUDIO_RATE;
+       this->max_w = this->max_h = 0;
+}
+
+CreateBD_Thread::~CreateBD_Thread()
+{
+       close_window();
+}
+
 int CreateBD_Thread::create_bd_jobs(ArrayList<BatchRenderJob*> *jobs, const char *asset_dir)
 {
        EDL *edl = mwindow->edl;
@@ -209,39 +264,6 @@ int CreateBD_Thread::create_bd_jobs(ArrayList<BatchRenderJob*> *jobs, const char
                use_wide_audio ? BD_WIDE_CHANNELS : BD_CHANNELS;
        session->interlace_mode = bd_interlace_mode;
 
-       char script_filename[BCTEXTLEN];
-       sprintf(script_filename, "%s/bd.sh", asset_dir);
-       int fd = open(script_filename, O_WRONLY+O_CREAT+O_TRUNC, 0755);
-       FILE *fp = fdopen(fd, "w");
-       if( !fp ) {
-               char err[BCTEXTLEN], msg[BCTEXTLEN];
-               strerror_r(errno, err, sizeof(err));
-               sprintf(msg, _("Unable to save: %s\n-- %s"), script_filename, err);
-               MainError::show_error(msg);
-               return 1;
-       }
-       char udfs[BCTEXTLEN], mopts[BCTEXTLEN], mntpt[BCTEXTLEN];
-       int is_usr_mnt = get_udfs_mount(udfs, mopts, mntpt);
-       const char *exec_path = File::get_cinlib_path();
-       fprintf(fp,"#!/bin/bash -ex\n");
-       fprintf(fp,"PATH=$PATH:%s\n",exec_path);
-       fprintf(fp,"mkdir -p $1/udfs\n");
-       fprintf(fp,"sz=`du -cb $1/bd.m2ts* | tail -1 | sed -e 's/[ \t].*//'`\n");
-       fprintf(fp,"blks=$((sz/2048 + 4096))\n");
-       fprintf(fp,"rm -f %s\n", udfs);
-       fprintf(fp,"mkudffs -b 2048 %s $blks\n", udfs);
-       fprintf(fp,"mount %s%s\n", mopts, mntpt);
-       fprintf(fp,"bdwrite %s $1/bd.m2ts*\n",mntpt);
-       fprintf(fp,"umount %s\n",mntpt);
-       if( is_usr_mnt )
-               fprintf(fp,"mv -f %s $1/bd.udfs\n", udfs);
-       fprintf(fp,"echo To burn bluray, load writable media and run:\n");
-       fprintf(fp,"echo for WORM: growisofs -dvd-compat -Z /dev/bd=$1/bd.udfs\n");
-       fprintf(fp,"echo for RW:   dd if=$1/bd.udfs of=/dev/bd bs=2048000\n");
-       fprintf(fp,"kill $$\n");
-       fprintf(fp,"\n");
-       fclose(fp);
-
        session->audio_channels = session->audio_tracks =
                !use_wide_audio ? BD_CHANNELS : BD_WIDE_CHANNELS;
        for( int i=0; i<MAX_CHANNELS; ++i )
@@ -275,7 +297,8 @@ int CreateBD_Thread::create_bd_jobs(ArrayList<BatchRenderJob*> *jobs, const char
                return 1;
        }
 
-       BatchRenderJob *job = new BatchRenderJob(mwindow->preferences, use_label_chapters);
+       BatchRenderJob *job = new BD_BatchRenderJob(mwindow->preferences,
+               use_labeled, use_farmed);
        jobs->append(job);
        strcpy(&job->edl_path[0], xml_filename);
        Asset *asset = job->asset;
@@ -301,30 +324,19 @@ int CreateBD_Thread::create_bd_jobs(ArrayList<BatchRenderJob*> *jobs, const char
        asset->ff_audio_bitrate = bd_kaudio_rate * 1000;
 
        asset->video_data = 1;
-       strcpy(asset->vcodec, "bluray.m2ts");
+       const char *vcodec = "bluray.m2ts";
+       switch( asset->interlace_mode ) {
+       case ILACE_MODE_TOP_FIRST:    vcodec = "bluray_tff.m2ts";  break;
+       case ILACE_MODE_BOTTOM_FIRST: vcodec = "bluray_bff.m2ts";  break;
+       case ILACE_MODE_FAKE_INTERLACE : vcodec = "bluray_fakeinterlace.m2ts";  break;
+       }
+       strcpy(asset->vcodec, vcodec);
        //mwindow->defaults->get("DEFAULT_BLURAY_VCODEC", asset->vcodec);
        FFMPEG::set_option_path(option_path, "video/%s", asset->vcodec);
        FFMPEG::load_options(option_path, asset->ff_video_options,
                 sizeof(asset->ff_video_options));
-       const char *opts = 0;
-       switch( asset->interlace_mode ) {
-       case ILACE_MODE_TOP_FIRST:    opts = ":tff\n";  break;
-       case ILACE_MODE_BOTTOM_FIRST: opts = ":bff\n";  break;
-       }
-       if( opts ) {
-               int len = strlen(asset->ff_video_options);
-               char *cp = asset->ff_video_options + len-1;
-               strncpy(cp, opts, sizeof(asset->ff_video_options)-len);
-       }
        asset->ff_video_bitrate = vid_bitrate;
        asset->ff_video_quality = -1;
-
-       job = new BatchRenderJob(mwindow->preferences, 0, 0);
-       jobs->append(job);
-       job->edl_path[0] = '@';
-       strcpy(&job->edl_path[1], script_filename);
-       strcpy(&job->asset->path[0], asset_dir);
-
        return 0;
 }
 
@@ -352,7 +364,7 @@ void CreateBD_Thread::handle_close_event(int result)
                Tracks *tracks = mwindow->edl->tracks;
                for( Track *vtrk=tracks->first; vtrk; vtrk=vtrk->next ) {
                        if( vtrk->data_type != TRACK_VIDEO ) continue;
-                       if( !vtrk->record ) continue;
+                       if( !vtrk->is_armed() ) continue;
                        vtrk->expand_view = 1;
                        PluginSet *plugin_set = new PluginSet(mwindow->edl, vtrk);
                        vtrk->plugin_set.append(plugin_set);
@@ -413,7 +425,7 @@ void CreateBD_Thread::handle_close_event(int result)
        mwindow->resync_guis();
        if( ret ) return;
        mwindow->batch_render->save_jobs();
-       mwindow->batch_render->start();
+       mwindow->batch_render->start(-use_farmed, -use_labeled);
 }
 
 BC_Window* CreateBD_Thread::new_gui()
@@ -432,7 +444,8 @@ BC_Window* CreateBD_Thread::new_gui()
        use_inverse_telecine = 0;
        use_wide_audio = 0;
        use_resize_tracks = 0;
-       use_label_chapters = 0;
+       use_labeled = 0;
+       use_farmed = 0;
        use_standard = !strcmp(mwindow->default_std(),"NTSC") ?
                 BD_1920x1080_2997i : BD_1920x1080_25i;
        bd_size = BD_SIZE;
@@ -465,7 +478,7 @@ BC_Window* CreateBD_Thread::new_gui()
        int scr_x = mwindow->gui->get_screen_x(0, -1);
        int scr_w = mwindow->gui->get_screen_w(0, -1);
        int scr_h = mwindow->gui->get_screen_h(0, -1);
-       int w = 500, h = 280;
+       int w = xS(560), h = yS(290);
        int x = scr_x + scr_w/2 - w/2, y = scr_h/2 - h/2;
 
        gui = new CreateBD_GUI(this, x, y, w, h);
@@ -664,7 +677,7 @@ CreateBD_Histogram::~CreateBD_Histogram()
 }
 
 CreateBD_LabelChapters::CreateBD_LabelChapters(CreateBD_GUI *gui, int x, int y)
- : BC_CheckBox(x, y, &gui->thread->use_label_chapters, _("Chapters at Labels"))
+ : BC_CheckBox(x, y, &gui->thread->use_labeled, _("Chapters at Labels"))
 {
        this->gui = gui;
 }
@@ -673,6 +686,17 @@ CreateBD_LabelChapters::~CreateBD_LabelChapters()
 {
 }
 
+CreateBD_UseRenderFarm::CreateBD_UseRenderFarm(CreateBD_GUI *gui, int x, int y)
+ : BC_CheckBox(x, y, &gui->thread->use_farmed, _("Use render farm"))
+{
+       this->gui = gui;
+}
+
+CreateBD_UseRenderFarm::~CreateBD_UseRenderFarm()
+{
+}
+
+
 CreateBD_WideAudio::CreateBD_WideAudio(CreateBD_GUI *gui, int x, int y)
  : BC_CheckBox(x, y, &gui->thread->use_wide_audio, _("Audio 5.1"))
 {
@@ -685,7 +709,7 @@ CreateBD_WideAudio::~CreateBD_WideAudio()
 
 
 CreateBD_GUI::CreateBD_GUI(CreateBD_Thread *thread, int x, int y, int w, int h)
- : BC_Window(_(PROGRAM_NAME ": Create BD"), x, y, w, h, 50, 50, 1, 0, 1)
+ : BC_Window(_(PROGRAM_NAME ": Create BD"), x, y, w, h, xS(50), yS(50), 1, 0, 1)
 {
        this->thread = thread;
        at_x = at_y = tmp_x = tmp_y = 0;
@@ -703,7 +727,8 @@ CreateBD_GUI::CreateBD_GUI(CreateBD_Thread *thread, int x, int y, int w, int h)
        need_histogram = 0;
        non_standard = 0;
        need_wide_audio = 0;
-       need_label_chapters = 0;
+       need_labeled = 0;
+       need_farmed = 0;
        ok = 0;
        cancel = 0;
 }
@@ -714,20 +739,23 @@ CreateBD_GUI::~CreateBD_GUI()
 
 void CreateBD_GUI::create_objects()
 {
+       int xs10 = xS(10), xs35 = xS(35);
+       int xs160 = xS(160), xs170 = xS(170);
+       int ys5 = yS(5), ys10 = yS(10);
        lock_window("CreateBD_GUI::create_objects");
-       int pady = BC_TextBox::calculate_h(this, MEDIUMFONT, 0, 1) + 5;
+       int pady = BC_TextBox::calculate_h(this, MEDIUMFONT, 0, 1) + ys5;
        int padx = BC_Title::calculate_w(this, (char*)"X", MEDIUMFONT);
        int x = padx/2, y = pady/2;
        BC_Title *title = new BC_Title(x, y, _("Title:"), MEDIUMFONT, YELLOW);
        add_subwindow(title);
        at_x = x + title->get_w();  at_y = y;
-       asset_title = new CreateBD_AssetTitle(this, at_x, at_y, get_w()-at_x-10);
+       asset_title = new CreateBD_AssetTitle(this, at_x, at_y, get_w()-at_x-xs10);
        add_subwindow(asset_title);
        y += title->get_h() + pady/2;
        title = new BC_Title(x, y, _("Work path:"), MEDIUMFONT, YELLOW);
        add_subwindow(title);
        tmp_x = x + title->get_w();  tmp_y = y;
-       tmp_path = new CreateBD_TmpPath(this, tmp_x, tmp_y,  get_w()-tmp_x-35);
+       tmp_path = new CreateBD_TmpPath(this, tmp_x, tmp_y,  get_w()-tmp_x-xs35);
        add_subwindow(tmp_path);
        btmp_path = new BrowseButton(thread->mwindow->theme, this, tmp_path,
                tmp_x+tmp_path->get_w(), tmp_y, "/tmp",
@@ -736,7 +764,7 @@ void CreateBD_GUI::create_objects()
        y += title->get_h() + pady/2;
        disk_space = new CreateBD_DiskSpace(this, x, y);
        add_subwindow(disk_space);
-       int x0 = get_w() - 170;
+       int x0 = get_w() - xs170;
        title = new BC_Title(x0, y, _("Media:"), MEDIUMFONT, YELLOW);
        add_subwindow(title);
        int x1 =  x0+title->get_w()+padx;
@@ -754,7 +782,7 @@ void CreateBD_GUI::create_objects()
        add_subwindow(standard);
        standard->create_objects();
        standard->set_text(bd_formats[thread->use_standard].name);
-       x0 -= 30;
+       x0 -= xS(60);
        title = new BC_Title(x0, y, _("Scale:"), MEDIUMFONT, YELLOW);
        add_subwindow(title);
        x1 = x0+title->get_w()+padx;
@@ -762,33 +790,40 @@ void CreateBD_GUI::create_objects()
        add_subwindow(scale);
        scale->create_objects();
        y += standard->get_h() + pady/2;
-       need_deinterlace = new CreateBD_Deinterlace(this, x, y);
+       x1 = x;  int y1 = y;
+       need_deinterlace = new CreateBD_Deinterlace(this, x1, y);
        add_subwindow(need_deinterlace);
-       x1 = x + 170; //, x2 = x1 + 150;
-       need_inverse_telecine = new CreateBD_InverseTelecine(this, x1, y);
-       add_subwindow(need_inverse_telecine);
        y += need_deinterlace->get_h() + pady/2;
-       need_histogram = new CreateBD_Histogram(this, x, y);
+       need_histogram = new CreateBD_Histogram(this, x1, y);
        add_subwindow(need_histogram);
-       need_wide_audio = new CreateBD_WideAudio(this, x1, y);
-       add_subwindow(need_wide_audio);
        y += need_histogram->get_h() + pady/2;
-       non_standard = new BC_Title(x, y+5, "", MEDIUMFONT, RED);
+       non_standard = new BC_Title(x1, y+ys5, "", MEDIUMFONT, RED);
        add_subwindow(non_standard);
+       x1 += xs160;  y = y1;
+       need_inverse_telecine = new CreateBD_InverseTelecine(this, x1, y);
+       add_subwindow(need_inverse_telecine);
+       y += need_inverse_telecine->get_h() + pady/2;
+       need_wide_audio = new CreateBD_WideAudio(this, x1, y);
+       add_subwindow(need_wide_audio);
+       y += need_wide_audio->get_h() + pady/2;
        need_resize_tracks = new CreateBD_ResizeTracks(this, x1, y);
        add_subwindow(need_resize_tracks);
-//     need_label_chapters = new CreateBD_LabelChapters(this, x2, y);
-//     add_subwindow(need_label_chapters);
+       x1 += xs160;  y = y1;
+       need_labeled = new CreateBD_LabelChapters(this, x1, y);
+       add_subwindow(need_labeled);
+       y += need_labeled->get_h() + pady/2;
+       need_farmed = new CreateBD_UseRenderFarm(this, x1, y);
+       add_subwindow(need_farmed);
        ok_w = BC_OKButton::calculate_w();
        ok_h = BC_OKButton::calculate_h();
-       ok_x = 10;
-       ok_y = get_h() - ok_h - 10;
+       ok_x = xs10;
+       ok_y = get_h() - ok_h - xs10;
        ok = new CreateBD_OK(this, ok_x, ok_y);
        add_subwindow(ok);
        cancel_w = BC_CancelButton::calculate_w();
        cancel_h = BC_CancelButton::calculate_h();
-       cancel_x = get_w() - cancel_w - 10,
-       cancel_y = get_h() - cancel_h - 10;
+       cancel_x = get_w() - cancel_w - xs10,
+       cancel_y = get_h() - cancel_h - ys10;
        cancel = new CreateBD_Cancel(this, cancel_x, cancel_y);
        add_subwindow(cancel);
        show_window();
@@ -797,13 +832,15 @@ void CreateBD_GUI::create_objects()
 
 int CreateBD_GUI::resize_event(int w, int h)
 {
-       asset_title->reposition_window(at_x, at_y, get_w()-at_x-10);
-       tmp_path->reposition_window(tmp_x, tmp_y,  get_w()-tmp_x-35);
+       int xs10 = xS(10), xs35 = xS(35);
+       int ys10 = yS(10);
+       asset_title->reposition_window(at_x, at_y, get_w()-at_x-xs10);
+       tmp_path->reposition_window(tmp_x, tmp_y,  get_w()-tmp_x-xs35);
        btmp_path->reposition_window(tmp_x+tmp_path->get_w(), tmp_y);
-       ok_y = h - ok_h - 10;
+       ok_y = h - ok_h - ys10;
        ok->reposition_window(ok_x, ok_y);
-       cancel_x = w - cancel_w - 10,
-       cancel_y = h - cancel_h - 10;
+       cancel_x = w - cancel_w - xs10,
+       cancel_y = h - cancel_h - ys10;
        cancel->reposition_window(cancel_x, cancel_y);
        return 0;
 }
@@ -827,7 +864,8 @@ void CreateBD_GUI::update()
        need_resize_tracks->set_value(thread->use_resize_tracks);
        need_histogram->set_value(thread->use_histogram);
        need_wide_audio->set_value(thread->use_wide_audio);
-//     need_label_chapters->set_value(thread->use_label_chapters);
+       need_labeled->set_value(thread->use_labeled);
+       need_farmed->set_value(thread->use_farmed);
 }
 
 int CreateBD_Thread::
@@ -836,7 +874,7 @@ insert_video_plugin(const char *title, KeyFrame *default_keyframe)
        Tracks *tracks = mwindow->edl->tracks;
        for( Track *vtrk=tracks->first; vtrk; vtrk=vtrk->next ) {
                if( vtrk->data_type != TRACK_VIDEO ) continue;
-               if( !vtrk->record ) continue;
+               if( !vtrk->is_armed() ) continue;
                vtrk->expand_view = 1;
                PluginSet *plugin_set = new PluginSet(mwindow->edl, vtrk);
                vtrk->plugin_set.append(plugin_set);
@@ -860,7 +898,7 @@ resize_tracks()
        if( trk_h < bd_height ) trk_h = bd_height;
        for( Track *vtrk=tracks->first; vtrk; vtrk=vtrk->next ) {
                if( vtrk->data_type != TRACK_VIDEO ) continue;
-               if( !vtrk->record ) continue;
+               if( !vtrk->is_armed() ) continue;
                vtrk->track_w = trk_w;
                vtrk->track_h = trk_h;
        }
@@ -875,7 +913,8 @@ option_presets()
        use_scale = Rescale::none;
        use_resize_tracks = 0;
        use_wide_audio = 0;
-       use_label_chapters = 0;
+       use_labeled = 0;
+       use_farmed = 0;
 
        if( !mwindow->edl ) return 1;
 
@@ -894,7 +933,7 @@ option_presets()
        max_w = 0;  max_h = 0;
        int has_deinterlace = 0, has_scale = 0;
        for( Track *trk=tracks->first; trk; trk=trk->next ) {
-               if( !trk->record ) continue;
+               if( !trk->is_armed() ) continue;
                Edits *edits = trk->edits;
                switch( trk->data_type ) {
                case TRACK_VIDEO:
@@ -934,7 +973,7 @@ option_presets()
                if( max_h != bd_height ) use_resize_tracks = 1;
        }
        for( Track *trk=tracks->first; trk && !use_resize_tracks; trk=trk->next ) {
-               if( !trk->record ) continue;
+               if( !trk->is_armed() ) continue;
                switch( trk->data_type ) {
                case TRACK_VIDEO:
                        if( trk->track_w != max_w ) use_resize_tracks = 1;
@@ -943,8 +982,6 @@ option_presets()
                }
        }
        if( !has_deinterlace && max_h > 2*bd_height ) use_deinterlace = 1;
-       // Labels *labels = mwindow->edl->labels;
-       // use_label_chapters = labels && labels->first ? 1 : 0;
 
        if( tracks->recordable_audio_tracks() == BD_WIDE_CHANNELS )
                use_wide_audio = 1;
@@ -986,7 +1023,7 @@ int CreateBD_FormatItem::handle_event()
 
 
 CreateBD_Format::CreateBD_Format(CreateBD_GUI *gui, int x, int y)
- : BC_PopupMenu(x, y, 180, bd_formats[gui->thread->use_standard].name, 1)
+ : BC_PopupMenu(x, y, xS(200), bd_formats[gui->thread->use_standard].name, 1)
 {
        this->gui = gui;
 }
@@ -1041,7 +1078,7 @@ int CreateBD_ScaleItem::handle_event()
 
 
 CreateBD_Scale::CreateBD_Scale(CreateBD_GUI *gui, int x, int y)
- : BC_PopupMenu(x, y, 100, "", 1)
+ : BC_PopupMenu(x, y, xS(140), "", 1)
 {
        this->gui = gui;
 }
@@ -1067,7 +1104,7 @@ int CreateBD_Scale::handle_event()
 
 
 CreateBD_MediaSize::CreateBD_MediaSize(CreateBD_GUI *gui, int x, int y)
- : BC_PopupTextBox(gui, 0, 0, x, y, 70,50)
+ : BC_PopupTextBox(gui, 0, 0, x, y, xS(70),yS(50))
 {
        this->gui = gui;
 }