added keyframe reticle, fixes: DEL, transition at endtrk, DVD/BD render menu

[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 43b3a1c76346e9e8737c97d5c669577cc5bd4930..76efb7efeb81e0897ec85a0ec8503bfcd1ea33a9 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindowgui.C
+++ b/cinelerra-5.1/cinelerra/mwindowgui.C
@@ -143,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;
@@ -353,7 +355,9 @@ void MWindowGUI::create_objects()
        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);
 
@@ -1014,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)
@@ -1412,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();