projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename file and add Andrew 0002 HAVE_DV patch
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
bdcreate.C
diff --git
a/cinelerra-5.1/cinelerra/bdcreate.C
b/cinelerra-5.1/cinelerra/bdcreate.C
index e18ebee3cc830cf40bf9e20f37e1b5b8ed925c2b..150f835d523fdf9fb960a5817116feaf542433a5 100644
(file)
--- a/
cinelerra-5.1/cinelerra/bdcreate.C
+++ b/
cinelerra-5.1/cinelerra/bdcreate.C
@@
-80,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)
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_ctrl(1);
+ set_shift(1);
this->mwindow = mwindow;
}
this->mwindow = mwindow;
}
@@
-171,7
+172,7
@@
char *BD_BatchRenderJob::create_script(EDL *edl, ArrayList<Indexable *> *idxbls)
fprintf(fp,"dir=`cd \"$sdir\"; pwd`\n");
fprintf(fp,"PATH=$PATH:%s\n",exec_path);
fprintf(fp,"mkdir -p $dir/udfs\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/[
\t
].*//'`\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,"blks=$((sz/2048 + 4096))\n");
fprintf(fp,"rm -f %s\n", udfs);
fprintf(fp,"mkudffs -b 2048 %s $blks\n", udfs);
@@
-363,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;
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);
vtrk->expand_view = 1;
PluginSet *plugin_set = new PluginSet(mwindow->edl, vtrk);
vtrk->plugin_set.append(plugin_set);
@@
-514,7
+515,7
@@
int CreateBD_OK::button_press_event()
int CreateBD_OK::keypress_event()
{
int CreateBD_OK::keypress_event()
{
- return
0
;
+ return
context_help_check_and_show()
;
}
}
@@
-730,6
+731,8
@@
CreateBD_GUI::CreateBD_GUI(CreateBD_Thread *thread, int x, int y, int w, int h)
need_farmed = 0;
ok = 0;
cancel = 0;
need_farmed = 0;
ok = 0;
cancel = 0;
+// *** CONTEXT_HELP ***
+ context_help_set_keyword("DVD and Bluray Creation");
}
CreateBD_GUI::~CreateBD_GUI()
}
CreateBD_GUI::~CreateBD_GUI()
@@
-873,7
+876,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;
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);
vtrk->expand_view = 1;
PluginSet *plugin_set = new PluginSet(mwindow->edl, vtrk);
vtrk->plugin_set.append(plugin_set);
@@
-897,7
+900,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( 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;
}
vtrk->track_w = trk_w;
vtrk->track_h = trk_h;
}
@@
-932,7
+935,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 ) {
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:
Edits *edits = trk->edits;
switch( trk->data_type ) {
case TRACK_VIDEO:
@@
-972,7
+975,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( 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;
switch( trk->data_type ) {
case TRACK_VIDEO:
if( trk->track_w != max_w ) use_resize_tracks = 1;