X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmainmenu.C;h=d85ef6bad0045d236d318b57b3316e32df202f86;hb=efc8fa7dc7ddcdeaa9398e09d81975a6ccf526fc;hp=a3fb40385fab857918ea6a0f5c68a81f9b670a5e;hpb=24db15d85f2e4c986ff91f992e815747c55948f3;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mainmenu.C b/cinelerra-5.1/cinelerra/mainmenu.C
index a3fb4038..d85ef6ba 100644
--- a/cinelerra-5.1/cinelerra/mainmenu.C
+++ b/cinelerra-5.1/cinelerra/mainmenu.C
@@ -60,6 +60,7 @@
 #include "patchbay.h"
 #include "playbackengine.h"
 #include "preferences.h"
+#include "proxy.h"
 #include "preferencesthread.h"
 #include "quit.h"
 #include "record.h"
@@ -203,6 +204,9 @@ void MainMenu::create_objects()
 
 	settingsmenu->add_item(new SetFormat(mwindow));
 	settingsmenu->add_item(preferences = new PreferencesMenuitem(mwindow));
+	ProxyMenuItem *proxy;
+	settingsmenu->add_item(proxy = new ProxyMenuItem(mwindow));
+	proxy->create_objects();
 	mwindow->preferences_thread = preferences->thread;
 	settingsmenu->add_item(labels_follow_edits = new LabelsFollowEdits(mwindow));
 	settingsmenu->add_item(plugins_follow_edits = new PluginsFollowEdits(mwindow));
@@ -252,6 +256,8 @@ void MainMenu::create_objects()
 	windowmenu->add_item(new BC_MenuItem("-"));
 	windowmenu->add_item(split_x = new SplitX(mwindow));
 	windowmenu->add_item(split_y = new SplitY(mwindow));
+	windowmenu->add_item(mixer_viewer = new MixerViewer(mwindow));
+	windowmenu->add_item(new TileMixers(mwindow));
 	windowmenu->add_item(new TileWindows(mwindow,_("Default positions"),-1,_("Ctrl-P"),'p'));
 	windowmenu->add_item(new TileWindows(mwindow,_("Tile left"),0));
 	windowmenu->add_item(new TileWindows(mwindow,_("Tile right"),1));
@@ -1522,3 +1528,29 @@ int SplitY::handle_event()
 }
 
 
+MixerViewer::MixerViewer(MWindow *mwindow)
+ : BC_MenuItem(_("Mixer Viewer"), _("Shift-M"), 'M')
+{
+	this->mwindow = mwindow;
+	set_shift(1);
+}
+
+int MixerViewer::handle_event()
+{
+	mwindow->start_mixer();
+	return 1;
+}
+
+TileMixers::TileMixers(MWindow *mwindow)
+ : BC_MenuItem(_("Tile mixers"), "Alt-t", 't')
+{
+	this->mwindow = mwindow;
+	set_alt();
+}
+
+int TileMixers::handle_event()
+{
+	mwindow->tile_mixers();
+	return 1;
+}
+