batchrender asset path fix, ru xlat, fixup hevc/h265 opts, expand new bg pngs

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

diff --git a/cinelerra-5.1/cinelerra/assetedit.C b/cinelerra-5.1/cinelerra/assetedit.C
index dbdabf36edb49a00bdea9cdc145d288135e4d606..27a5a8db5ed72defb95f0d5a34dde1c391df099f 100644 (file)
--- a/cinelerra-5.1/cinelerra/assetedit.C
+++ b/cinelerra-5.1/cinelerra/assetedit.C
@@ -95,14 +95,14 @@ void AssetEdit::edit_asset(Indexable *indexable)
        {
                EDL *nested_edl = (EDL*)indexable;
 
-        strcpy(changed_params->path, nested_edl->path);
+               strcpy(changed_params->path, nested_edl->path);
                changed_params->sample_rate = nested_edl->session->sample_rate;
-        changed_params->channels = nested_edl->session->audio_channels;
+               changed_params->channels = nested_edl->session->audio_channels;
 
 //printf("AssetEdit::edit_asset %d %f\n", __LINE__, nested_edl->session->frame_rate);
                changed_params->frame_rate = nested_edl->session->frame_rate;
-        changed_params->width = nested_edl->session->output_w;
-        changed_params->height = nested_edl->session->output_h;
+               changed_params->width = nested_edl->session->output_w;
+               changed_params->height = nested_edl->session->output_h;
        }
 
        BC_DialogThread::start();
@@ -130,7 +130,7 @@ void AssetEdit::handle_close_event(int result)
                if(indexable->is_asset)
                {
                        asset = (Asset*)indexable;
-                       if(!changed_params->equivalent(*asset, 1, 1))
+                       if(!changed_params->equivalent(*asset, 1, 1, mwindow->edl))
                                changed = 1;
                }
                else
@@ -227,7 +227,7 @@ AssetEditWindow::AssetEditWindow(MWindow *mwindow, AssetEdit *asset_edit)
        mwindow->gui->get_abs_cursor_y(1) - (128 + 64 +
                (!asset_edit->indexable->have_audio() ? 0 : 180) +
                (!asset_edit->indexable->have_video() ? 0 : 350)) / 2,
-       400, (128 + 64 +
+       450, (128 + 64 +
                (!asset_edit->indexable->have_audio() ? 0 : 180) +
                (!asset_edit->indexable->have_video() ? 0 : 350)), 0, 0, 1)
 {
@@ -259,7 +259,7 @@ AssetEditWindow::~AssetEditWindow()
 
 void AssetEditWindow::create_objects()
 {
-       int y = 10, x = 10, x1 = 10, x2 = 160;
+       int y = 10, x = 10, x1 = 10, x2 = 190;
        char string[BCTEXTLEN];
        int vmargin;
        FileSystem fs;
@@ -577,11 +577,11 @@ void AssetEditWindow::create_objects()
                y += ilacefixoption_chkboxw->get_h() + 5;
                // --------------------
                add_subwindow(title = new BC_Title(x1, y, _("Asset's interlacing:")));
-               add_subwindow(textboxw = new AssetEditILacemode(this, "", BC_ILACE_ASSET_MODEDEFAULT, x2, y, 200));
+               add_subwindow(textboxw = new AssetEditILacemode(this, "", ILACE_ASSET_MODEDEFAULT, x2, y, 200));
                ilacefixoption_chkboxw->ilacemode_textbox = textboxw;
                add_subwindow(listboxw = new AssetEditInterlacemodePulldown(mwindow,
                                                        textboxw,
-                                                       &asset->interlace_mode,
+                                                       &asset_edit->changed_params->interlace_mode,
                                                        (ArrayList<BC_ListBoxItem*>*)&mwindow->interlace_asset_modes,
                                                        ilacefixoption_chkboxw,
                                                        x2 + textboxw->get_w(),
@@ -591,11 +591,11 @@ void AssetEditWindow::create_objects()
 
                // --------------------
                add_subwindow(title = new BC_Title(x1, y, _("Interlace correction:")));
-               add_subwindow(textboxw = new AssetEditILacefixmethod(this, "", BC_ILACE_FIXDEFAULT, x2, y, 200));
+               add_subwindow(textboxw = new AssetEditILacefixmethod(this, "", ILACE_FIXDEFAULT, x2, y, 200));
                ilacefixoption_chkboxw->ilacefixmethod_textbox = textboxw;
                add_subwindow(listboxw = new InterlacefixmethodPulldown(mwindow,
                                                        textboxw,
-                                                       &asset->interlace_fixmethod,
+                                                       &asset_edit->changed_params->interlace_fixmethod,
                                                        (ArrayList<BC_ListBoxItem*>*)&mwindow->interlace_asset_fixmethods,
                                                        x2 + textboxw->get_w(),
                                                        y));
@@ -621,8 +621,11 @@ void AssetEditWindow::create_objects()
 
 // Calculate values to enter into textboxes
                char text[32], *tc = text;
-               Units::totext(tc, asset->tcstart / asset->frame_rate,
-                       TIME_HMSF, asset->sample_rate, asset->frame_rate);
+               if( asset )
+                       Units::totext(tc, asset->tcstart / asset->frame_rate,
+                               TIME_HMSF, asset->sample_rate, asset->frame_rate);
+               else
+                       strcpy(tc, "0:00:00:00");
 
                const char *tc_hours = tc, *tc_minutes, *tc_seconds, *tc_rest;
                tc = strchr(tc, ':');  *tc++ = 0;  tc_minutes = tc;
@@ -704,7 +707,7 @@ int AssetEditFRate::handle_event()
 
 Interlaceautofix::Interlaceautofix(MWindow *mwindow,AssetEditWindow *fwindow, int x, int y)
  : BC_CheckBox(x, y,
-       ((Asset *)fwindow->asset_edit->indexable)->interlace_autofixoption,
+       fwindow->asset_edit->changed_params->interlace_autofixoption,
        _("Automatically Fix Interlacing"))
 {
        this->fwindow = fwindow;
@@ -717,7 +720,7 @@ Interlaceautofix::~Interlaceautofix()
 
 int Interlaceautofix::handle_event()
 {
-       Asset *asset = (Asset *)fwindow->asset_edit->indexable;
+       Asset *asset = fwindow->asset_edit->changed_params;
        asset->interlace_autofixoption = get_value();
        showhideotherwidgets();
        return 1;
@@ -727,8 +730,8 @@ void Interlaceautofix::showhideotherwidgets()
 {
   int thevalue = get_value();
 
-       Asset *asset = (Asset *)fwindow->asset_edit->indexable;
-       if (thevalue == BC_ILACE_AUTOFIXOPTION_AUTO)
+       Asset *asset = fwindow->asset_edit->changed_params;
+       if (thevalue == ILACE_AUTOFIXOPTION_AUTO)
          {
            this->ilacemode_textbox->enable();
            this->ilacemode_listbox->enable();
@@ -738,7 +741,7 @@ void Interlaceautofix::showhideotherwidgets()
            ilacefixmethod_to_text(string,xx);
            this->ilacefixmethod_textbox->update(string);
          }
-       if (thevalue == BC_ILACE_AUTOFIXOPTION_MANUAL)
+       if (thevalue == ILACE_AUTOFIXOPTION_MANUAL)
          {
            this->ilacemode_textbox->disable();
            this->ilacemode_listbox->disable();
@@ -788,7 +791,7 @@ AssetEditILaceautofixoption::AssetEditILaceautofixoption(AssetEditWindow *fwindo
 
 int AssetEditILaceautofixoption::handle_event()
 {
-       Asset *asset = (Asset *)fwindow->asset_edit->indexable;
+       Asset *asset = fwindow->asset_edit->changed_params;
        asset->interlace_autofixoption = ilaceautofixoption_from_text(get_text(), this->thedefault);
        return 1;
 }
@@ -803,7 +806,7 @@ AssetEditILacemode::AssetEditILacemode(AssetEditWindow *fwindow, const char *tex
 
 int AssetEditILacemode::handle_event()
 {
-       Asset *asset = (Asset *)fwindow->asset_edit->indexable;
+       Asset *asset = fwindow->asset_edit->changed_params;
        asset->interlace_mode = ilacemode_from_text(get_text(),this->thedefault);
        return 1;
 }
@@ -950,7 +953,7 @@ int AssetEditPathText::handle_event()
 AssetEditPath::AssetEditPath(MWindow *mwindow, AssetEditWindow *fwindow,
        BC_TextBox *textbox, int y, const char *text,
        const char *window_title, const char *window_caption)
- : BrowseButton(mwindow, fwindow, textbox, 310, y, text,
+ : BrowseButton(mwindow->theme, fwindow, textbox, 310, y, text,
        window_title, window_caption, 0)
 {
        this->fwindow = fwindow;
@@ -1086,8 +1089,7 @@ void DetailAssetThread::run()
 
 
 AssetEditReelName::AssetEditReelName(AssetEditWindow *fwindow, int x, int y)
- : BC_TextBox(x, y, 220, 1,
-       ((Asset *)fwindow->asset_edit->indexable)->reel_name,
+ : BC_TextBox(x, y, 220, 1, fwindow->asset_edit->changed_params->reel_name,
        1, MEDIUMFONT, 1)
 {
        this->fwindow = fwindow;
@@ -1107,7 +1109,7 @@ int AssetEditReelName::handle_event()
 
 
 AssetEditReelNumber::AssetEditReelNumber(AssetEditWindow *fwindow, int x, int y)
- : BC_TextBox(x, y, 200, 1, ((Asset *)fwindow->asset_edit->indexable)->reel_number)
+ : BC_TextBox(x, y, 200, 1, fwindow->asset_edit->changed_params->reel_number)
 {
        this->fwindow = fwindow;
 }