X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fbdcreate.C;h=57c207bae4e40e515e91c3757245751e7e2ceb68;hb=f110e7626d433b4724befe0871a3a35f9f81f264;hp=f8e424dce5d4b3433f477ebdfa6b36c78e2852e3;hpb=43821d27c5b51c4250a251f20c98878f54deb288;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/bdcreate.C b/cinelerra-5.1/cinelerra/bdcreate.C index f8e424dc..57c207ba 100644 --- a/cinelerra-5.1/cinelerra/bdcreate.C +++ b/cinelerra-5.1/cinelerra/bdcreate.C @@ -17,6 +17,7 @@ #include "mwindowgui.h" #include "plugin.h" #include "pluginset.h" +#include "preferences.h" #include "rescale.h" #include "track.h" #include "tracks.h" @@ -45,14 +46,14 @@ static struct bd_format { { "1920x1080 24p", 1920,1080, 24., 1, ILACE_MODE_NOTINTERLACED }, { "1920x1080 25i", 1920,1080, 25., 1, ILACE_MODE_TOP_FIRST }, { "1920x1080 23.976p", 1920,1080, 23.976, 1, ILACE_MODE_NOTINTERLACED }, - { "1440x1080 29.97i", 1440,1080, 29.97, 0, ILACE_MODE_TOP_FIRST }, - { "1440x1080 25i", 1440,1080, 25., 0, ILACE_MODE_TOP_FIRST }, - { "1440x1080 24p", 1440,1080, 24., 0, ILACE_MODE_NOTINTERLACED }, - { "1440x1080 23.976p", 1440,1080, 23.976, 0, 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 }, + { "1440x1080 24p", 1440,1080, 24., 1, ILACE_MODE_NOTINTERLACED }, + { "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 23.976p", 1280,720, 23.976, 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 }, @@ -68,12 +69,12 @@ const double CreateBD_Thread::BD_WIDE_ASPECT_HEIGHT = 9.; const double CreateBD_Thread::BD_ASPECT_WIDTH = 4.; const double CreateBD_Thread::BD_ASPECT_HEIGHT = 3.; const double CreateBD_Thread::BD_FRAMERATE = 24000. / 1001.; -//const int CreateBD_Thread::BD_MAX_BITRATE = 40000000; -const int CreateBD_Thread::BD_MAX_BITRATE = 8000000; +const int CreateBD_Thread::BD_MAX_BITRATE = 40000000; +//const int CreateBD_Thread::BD_MAX_BITRATE = 8000000; const int CreateBD_Thread::BD_CHANNELS = 2; const int CreateBD_Thread::BD_WIDE_CHANNELS = 6; const double CreateBD_Thread::BD_SAMPLERATE = 48000; -const double CreateBD_Thread::BD_KAUDIO_RATE = 224; +const double CreateBD_Thread::BD_KAUDIO_RATE = 192; const int CreateBD_Thread::BD_INTERLACE_MODE = ILACE_MODE_NOTINTERLACED; CreateBD_MenuItem::CreateBD_MenuItem(MWindow *mwindow) @@ -426,6 +427,12 @@ BC_Window* CreateBD_Thread::new_gui() gui = new CreateBD_GUI(this, x, y, w, h); gui->create_objects(); + + if( getuid() != 0 ) { + mwindow->show_warning( + &mwindow->preferences->bd_warn_root, + _("Must be root to mount UDFS images\n")); + } return gui; }