X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmainmenu.C;h=0bd56ec3525664c91d1e05448b52dabcdd84ad1e;hp=a36efccec6a2cb0bcb11a329e8cec5d5e129c666;hb=502b6f3b6fd04f6b01c6d70dcb81aa304dd0db1c;hpb=0c36fdb4fc4d4a2efe353e2b6eb0bf5a1b1485d6

diff --git a/cinelerra-5.1/cinelerra/mainmenu.C b/cinelerra-5.1/cinelerra/mainmenu.C
index a36efcce..0bd56ec3 100644
--- a/cinelerra-5.1/cinelerra/mainmenu.C
+++ b/cinelerra-5.1/cinelerra/mainmenu.C
@@ -98,7 +98,7 @@ void MainMenu::create_objects()
 	total_loads = 0;
 
 	add_menu(filemenu = new BC_Menu(_("File")));
-	filemenu->add_item(new_project = new New(mwindow));
+	filemenu->add_item(new_project = new NewProject(mwindow));
 	new_project->create_objects();
 
 // file loaders
@@ -116,8 +116,10 @@ void MainMenu::create_objects()
 #ifdef HAVE_DVB
 	filemenu->add_item(new ChannelScan(mwindow));
 #endif
+#ifdef HAVE_COMMERCIAL
 	if( mwindow->has_commercials() )
 		filemenu->add_item(new DbWindowScan(mwindow));
+#endif
 	filemenu->add_item(new SubttlSWin(mwindow));
 
 	filemenu->add_item(render = new RenderItem(mwindow));
@@ -198,6 +200,9 @@ void MainMenu::create_objects()
 	trackmenu->add_item(new DeleteTracks(mwindow));
 	trackmenu->add_item(new DeleteTrack(mwindow));
 	trackmenu->add_item(new ConcatenateTracks(mwindow));
+	AppendTracks *append_tracks;
+	trackmenu->add_item(append_tracks = new AppendTracks(mwindow));
+	append_tracks->create_objects();
 	trackmenu->add_item(new AddSubttlTrack(mwindow));
 
 	add_menu(settingsmenu = new BC_Menu(_("Settings")));
@@ -256,6 +261,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));
@@ -856,7 +863,7 @@ int ClearDefaultKeyframe::handle_event()
 }
 
 Cut::Cut(MWindow *mwindow)
- : BC_MenuItem(_("Cut"), "x", 'x')
+ : BC_MenuItem(_("Split | Cut"), "x", 'x')
 {
 	this->mwindow = mwindow;
 }
@@ -1526,3 +1533,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;
+}
+