font debug env var, drag fixes, cposer hide scrollbar, plugin tool tip

[goodguy/history.git] / cinelerra-5.1 / cinelerra / bdcreate.C

diff --git a/cinelerra-5.1/cinelerra/bdcreate.C b/cinelerra-5.1/cinelerra/bdcreate.C
index cc0fbc8cf51375dc2c57bb8535840e0f4d2adacf..3ed07e48d70f96671535c9856f0362425b06c808 100644 (file)
--- a/cinelerra-5.1/cinelerra/bdcreate.C
+++ b/cinelerra-5.1/cinelerra/bdcreate.C
@@ -54,10 +54,10 @@ static struct bd_format {
        { "1280x720  50p",      1280,720,  50.,    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   25p*",      720,576,  25.,    0, ILACE_MODE_NOTINTERLACED },
        { "720x576   25i",       720,576,  25.,    0, ILACE_MODE_BOTTOM_FIRST },
-       { "720x480   29.97p*",   720,480,  29.97,  0, ILACE_MODE_NOTINTERLACED },
+       { "720x576   25p*",      720,576,  25.,    0, ILACE_MODE_NOTINTERLACED },
        { "720x480   29.97i",    720,480,  29.97,  0, ILACE_MODE_BOTTOM_FIRST },
+       { "720x480   29.97p*",   720,480,  29.97,  0, ILACE_MODE_NOTINTERLACED },
 };
 
 const int64_t CreateBD_Thread::BD_SIZE = 25000000000;
@@ -121,16 +121,17 @@ CreateBD_Thread::~CreateBD_Thread()
        close_window();
 }
 
-void CreateBD_Thread::get_udfs_mount(char *udfs, char *mopts, char *mntpt)
+int CreateBD_Thread::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");
        const char *home = getenv("HOME");
-       if( !home ) return;
+       if( !home ) return ret;
        FILE *fp = fopen("/etc/fstab","r");
-       if( !fp ) return;
+       if( !fp ) return ret;
        int len = strlen(home);
        char line[BCTEXTLEN], typ[BCTEXTLEN], file[BCTEXTLEN];
        char mpnt[BCTEXTLEN], opts[BCTEXTLEN];
@@ -158,10 +159,12 @@ void CreateBD_Thread::get_udfs_mount(char *udfs, char *mopts, char *mntpt)
                        strcpy(udfs, file);
                        strcpy(mopts, "");
                        strcpy(mntpt, mpnt);
+                       ret = 1;
                        break;
                }
        }
        fclose(fp);
+       return ret;
 }
 
 int CreateBD_Thread::create_bd_jobs(ArrayList<BatchRenderJob*> *jobs, const char *asset_dir)
@@ -218,7 +221,7 @@ int CreateBD_Thread::create_bd_jobs(ArrayList<BatchRenderJob*> *jobs, const char
                return 1;
        }
        char udfs[BCTEXTLEN], mopts[BCTEXTLEN], mntpt[BCTEXTLEN];
-       get_udfs_mount(udfs, mopts, mntpt);
+       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);
@@ -230,9 +233,12 @@ int CreateBD_Thread::create_bd_jobs(ArrayList<BatchRenderJob*> *jobs, const char
        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=%s\n", udfs);
-       fprintf(fp,"echo for RW:   dd if=%s of=/dev/bd bs=2048000\n",udfs);
+       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);
 
@@ -257,6 +263,7 @@ int CreateBD_Thread::create_bd_jobs(ArrayList<BatchRenderJob*> *jobs, const char
 
        double new_samplerate = session->sample_rate;
        double new_framerate = session->frame_rate;
+       edl->retrack();
        edl->rechannel();
        edl->resample(old_samplerate, new_samplerate, TRACK_AUDIO);
        edl->resample(old_framerate, new_framerate, TRACK_VIDEO);
@@ -409,8 +416,8 @@ void CreateBD_Thread::handle_close_event(int result)
        }
 
        char asset_dir[BCTEXTLEN], jobs_path[BCTEXTLEN];
-       sprintf(asset_dir, "%s/%s", tmp_path, asset_title);
-       sprintf(jobs_path, "%s/bd.jobs", asset_dir);
+       snprintf(asset_dir, sizeof(asset_dir), "%s/%s", tmp_path, asset_title);
+       snprintf(jobs_path, sizeof(jobs_path), "%s/bd.jobs", asset_dir);
        mwindow->batch_render->reset(jobs_path);
        int ret = create_bd_jobs(&mwindow->batch_render->jobs, asset_dir);
        mwindow->undo->update_undo_after(_("create bd"), LOAD_ALL);