opencv lib path fix, ub18 fixes

[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 b5a733bc3a4153de67a8a349a79599f10b22831f..51fa34fa4140a1f9a77c90436d2d805de0beb91d 100644 (file)
--- a/cinelerra-5.1/cinelerra/assetedit.C
+++ b/cinelerra-5.1/cinelerra/assetedit.C
@@ -272,8 +272,7 @@ void AssetEditWindow::create_objects()
        if( asset ) {
                add_subwindow(new BC_Title(x, y, _("File format:")));
                x = x2;
-               add_subwindow(new BC_Title(x, y, File::formattostr(mwindow->plugindb,
-                               asset->format),
+               add_subwindow(new BC_Title(x, y, File::formattostr(asset->format),
                        MEDIUMFONT,
                        mwindow->theme->assetedit_color));
                x = x1;
@@ -562,7 +561,7 @@ void AssetEditWindow::create_objects()
 void AssetEditWindow::show_info_detail()
 {
        int cur_x, cur_y;
-       get_abs_cursor_xy(cur_x, cur_y, 0);
+       get_abs_cursor(cur_x, cur_y, 0);
        detail_dialog->start((Asset*)asset_edit->indexable, cur_x, cur_y);
 }
 
@@ -872,27 +871,6 @@ AssetEditPath::~AssetEditPath() {}
 
 
 
-
-
-AssetEditFormat::AssetEditFormat(AssetEditWindow *fwindow, char* default_, int y)
- : FormatPopup(fwindow->mwindow->plugindb, 90, y)
-{
-       this->fwindow = fwindow;
-}
-AssetEditFormat::~AssetEditFormat()
-{
-}
-int AssetEditFormat::handle_event()
-{
-       Asset *asset = fwindow->asset_edit->changed_params;
-       asset->format = File::strtoformat(fwindow->mwindow->plugindb,
-               get_selection(0, 0)->get_text());
-       return 1;
-}
-
-
-
-
 DetailAssetButton::DetailAssetButton(AssetEditWindow *fwindow, int x, int y)
  : BC_GenericButton(x, y, _("Detail"))
 {