Credit Andrew - fix vorbis audio which was scratchy and ensure aging plugin does...

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / clippopup.C

diff --git a/cinelerra-5.1/cinelerra/clippopup.C b/cinelerra-5.1/cinelerra/clippopup.C
index cbff1d707a9bc80530051bb188bf2bc77126c98b..d473e195af2d2331d535c282f0eb9214d0282e7a 100644 (file)
--- a/cinelerra-5.1/cinelerra/clippopup.C
+++ b/cinelerra-5.1/cinelerra/clippopup.C
@@ -129,6 +129,12 @@ int ClipPopup::update()
 {
        format->update();
        gui->collect_assets();
+       EDL *clip = !mwindow->session->drag_clips->size() ? 0 :
+               mwindow->session->drag_clips->get(0);
+       int enable_open = clip ? 1 : 0;
+       open_edl->set_enabled(enable_open);
+       int enable_close = mwindow->stack.size() > 0 ? 1 : 0;
+       close_edl->set_enabled(enable_close);
        return 0;
 }
 
@@ -416,6 +422,8 @@ void ClipListMenu::create_objects()
 void ClipListMenu::update()
 {
        format->update();
+       int enable_close = mwindow->stack.size() > 0 ? 1 : 0;
+       close_edl->set_enabled(enable_close);
 }
 
 
@@ -431,10 +439,10 @@ ClipPopupToMedia::~ClipPopupToMedia()
 
 int ClipPopupToMedia::handle_event()
 {
-       if( mwindow->edl->session->proxy_scale == 1 )
+       if( mwindow->edl->session->proxy_state != PROXY_ACTIVE )
                mwindow->clip_to_media();
        else
-               eprintf("Nesting not allowed when proxy scale != 1");
+               eprintf("Nesting not allowed when proxy active");
        return 1;
 }
 
@@ -456,7 +464,7 @@ int ClipPopupOpenEDL::handle_event()
        if( clips_total ) {
                popup->unlock_window();
                EDL *clip = mwindow->session->drag_clips->values[0];
-               mwindow->stack_push(clip);
+               mwindow->stack_push(clip, 0);
                popup->lock_window("ClipPopupOpenEDL::handle_event");
        }
        return 1;