fix min speed value 0.005, fix canvas lock hang, fix reset_caches crashing on vicon...

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

diff --git a/cinelerra-5.1/cinelerra/mainmenu.C b/cinelerra-5.1/cinelerra/mainmenu.C
index 7b9b3707d28649e0aed9a0423b0c6636c1dab160..94c884206b3ac4e6c826546792f0d66734545760 100644 (file)
--- a/cinelerra-5.1/cinelerra/mainmenu.C
+++ b/cinelerra-5.1/cinelerra/mainmenu.C
@@ -28,6 +28,7 @@
 #include "bdcreate.h"
 #include "cache.h"
 #include "channelinfo.h"
+#include "convert.h"
 #include "cplayback.h"
 #include "cropvideo.h"
 #include "cwindow.h"
@@ -218,6 +219,9 @@ void MainMenu::create_objects()
        ProxyMenuItem *proxy;
        settingsmenu->add_item(proxy = new ProxyMenuItem(mwindow));
        proxy->create_objects();
+       ConvertMenuItem *convert;
+       settingsmenu->add_item(convert = new ConvertMenuItem(mwindow));
+       convert->create_objects();
        mwindow->preferences_thread = preferences->thread;
        settingsmenu->add_item(cursor_on_frames = new CursorOnFrames(mwindow));
        settingsmenu->add_item(labels_follow_edits = new LabelsFollowEdits(mwindow));
@@ -945,9 +949,7 @@ Clear::Clear(MWindow *mwindow)
 int Clear::handle_event()
 {
        if( mwindow->session->current_operation == NO_OPERATION ) {
-               mwindow->cwindow->gui->lock_window("Clear::handle_event");
                mwindow->clear_entry();
-               mwindow->cwindow->gui->unlock_window();
        }
        return 1;
 }
@@ -1243,8 +1245,9 @@ int DeleteFirstTrack::handle_event()
 }
 
 DeleteLastTrack::DeleteLastTrack(MWindow *mwindow)
- : BC_MenuItem(_("Delete last track"), "d", 'd')
+ : BC_MenuItem(_("Delete last track"), "Ctrl-d", 'd')
 {
+       set_ctrl(1);
        this->mwindow = mwindow;
 }