clip fixes, ladspa build fixes

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

diff --git a/cinelerra-5.1/cinelerra/assetpopup.C b/cinelerra-5.1/cinelerra/assetpopup.C
index 12a51429690bf93d5d192d23c89efb5865f25dff..478b4568eb7d0c72ecb9ef6b3ffaad3af96484eb 100644 (file)
--- a/cinelerra-5.1/cinelerra/assetpopup.C
+++ b/cinelerra-5.1/cinelerra/assetpopup.C
@@ -59,8 +59,8 @@ AssetPopup::~AssetPopup()
 
 void AssetPopup::create_objects()
 {
-//     add_item(format = new AssetListFormat(mwindow));
        add_item(info = new AssetPopupInfo(mwindow, this));
+       add_item(format = new AssetListFormat(mwindow));
        add_item(new AssetPopupSort(mwindow, this));
        add_item(index = new AssetPopupBuildIndex(mwindow, this));
        add_item(view = new AssetPopupView(mwindow, this));
@@ -119,7 +119,7 @@ void AssetPopup::match_all()
 
 int AssetPopup::update()
 {
-//     format->update();
+       format->update();
        gui->collect_assets();
        return 0;
 }
@@ -147,17 +147,8 @@ int AssetPopupInfo::handle_event()
 {
        if(mwindow->session->drag_assets->total)
        {
-               if(mwindow->awindow->asset_edit->running() &&
-                       mwindow->awindow->asset_edit->window)
-               {
-                       mwindow->awindow->asset_edit->window->raise_window();
-                       mwindow->awindow->asset_edit->window->flush();
-               }
-               else
-               {
-                       mwindow->awindow->asset_edit->edit_asset(
-                               mwindow->session->drag_assets->values[0]);
-               }
+               mwindow->awindow->asset_edit->edit_asset(
+                       mwindow->session->drag_assets->values[0]);
        }
        else
        if(mwindow->session->drag_clips->total)