fixup cut/paste bugs in de.po, fix segv in tz/ntsc lookup, add debian

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

diff --git a/cinelerra-5.1/cinelerra/mwindowgui.C b/cinelerra-5.1/cinelerra/mwindowgui.C
index 418146626e87d3da17cc405497531c9ab821fb09..76efb7efeb81e0897ec85a0ec8503bfcd1ea33a9 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindowgui.C
+++ b/cinelerra-5.1/cinelerra/mwindowgui.C
@@ -119,6 +119,7 @@ MWindowGUI::MWindowGUI(MWindow *mwindow)
        edit_menu = 0;
        plugin_menu = 0;
        keyframe_menu = 0;
+       keyframe_hide = 0;
        transition_menu = 0;
        remote_control = 0;
        cwindow_remote_handler = 0;
@@ -142,7 +143,9 @@ MWindowGUI::~MWindowGUI()
        delete resource_thread;
        resource_pixmaps.remove_all_objects();
        delete swindow;
+#ifdef HAVE_DVB
        delete channel_info;
+#endif
        delete db_window;
        delete x_divider;
        delete y_divider;
@@ -344,13 +347,17 @@ void MWindowGUI::create_objects()
        if(debug) printf("MWindowGUI::create_objects %d\n", __LINE__);
        add_subwindow(keyframe_menu = new KeyframePopup(mwindow, this));
        keyframe_menu->create_objects();
+       add_subwindow(keyframe_hide = new KeyframeHidePopup(mwindow, this));
+       keyframe_hide->create_objects();
 
 
        if(debug) printf("MWindowGUI::create_objects %d\n", __LINE__);
        add_subwindow(transition_menu = new TransitionPopup(mwindow, this));
        transition_menu->create_objects();
 
+#ifdef HAVE_DVB
        channel_info = new ChannelInfo(mwindow);
+#endif
        db_window = new DbWindow(mwindow);
        swindow = new SWindow(mwindow);
 
@@ -1011,7 +1018,7 @@ int MWindowGUI::drag_stop()
                if(pane[i]) result |= pane[i]->canvas->drag_stop(
                        &redraw);
        }
-
+       mwindow->edl->optimize();
 
 // since we don't have subwindows we have to terminate any drag operation
        if(result)
@@ -1409,9 +1416,11 @@ int MWindowGUI::keyboard_listener(int key)
        case KPHAND:
                mwindow->quit(0);
                break;
+#ifdef HAVE_DVB
        case KPBOOK:
                channel_info->toggle_scan();
                break;
+#endif
        case KPMENU:
                if( !remote_control->deactivate() )
                        remote_control->activate();