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 c2102d2bc10b57da38f8883c7856175da2b3933b..27a5a8db5ed72defb95f0d5a34dde1c391df099f 100644 (file)
--- a/cinelerra-5.1/cinelerra/assetedit.C
+++ b/cinelerra-5.1/cinelerra/assetedit.C
@@ -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
@@ -577,7 +577,7 @@ 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,
@@ -591,7 +591,7 @@ 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,
@@ -731,7 +731,7 @@ void Interlaceautofix::showhideotherwidgets()
   int thevalue = get_value();
 
        Asset *asset = fwindow->asset_edit->changed_params;
-       if (thevalue == BC_ILACE_AUTOFIXOPTION_AUTO)
+       if (thevalue == ILACE_AUTOFIXOPTION_AUTO)
          {
            this->ilacemode_textbox->enable();
            this->ilacemode_listbox->enable();
@@ -741,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();
@@ -953,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;