X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmainmenu.C;h=72b9b68bc9535d20c4d2fcbc81266db10912a27a;hb=2951f82f2d7e8edf91b42f610266fd84919dd5ef;hp=64e90885255df6e2dea596e1a150d58a6cd1629a;hpb=f5725c7e12def18fec49a295dad688652edaa4b3;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mainmenu.C b/cinelerra-5.1/cinelerra/mainmenu.C
index 64e90885..72b9b68b 100644
--- a/cinelerra-5.1/cinelerra/mainmenu.C
+++ b/cinelerra-5.1/cinelerra/mainmenu.C
@@ -209,6 +209,7 @@ void MainMenu::create_objects()
 	trackmenu->add_item(new DeleteFirstTrack(mwindow));
 	trackmenu->add_item(new DeleteLastTrack(mwindow));
 	trackmenu->add_item(new ConcatenateTracks(mwindow));
+	trackmenu->add_item(new AlignTimecodes(mwindow));
 	trackmenu->add_item(new SwapTracksUp(mwindow));
 	trackmenu->add_item(new SwapTracksDown(mwindow));
 	AppendTracks *append_tracks;
@@ -1673,6 +1674,7 @@ void MixerItems::create_objects()
 	mixer_submenu->add_submenuitem(new MixerViewer(this));
 	mixer_submenu->add_submenuitem(new TileMixers(this));
 	mixer_submenu->add_submenuitem(new AlignMixers(this));
+	mixer_submenu->add_submenuitem(new MixMasters(this));
 }
 
 int MixerItems::activate_submenu()
@@ -1768,6 +1770,31 @@ int AlignMixers::handle_event()
 	return 1;
 }
 
+MixMasters::MixMasters(MixerItems *mixer_items)
+ : MixerItem(mixer_items, _("Mix masters"), "", 0)
+{
+}
+
+int MixMasters::handle_event()
+{
+	MWindow *mwindow = mixer_items->mwindow;
+	mwindow->mix_masters();
+	return 1;
+}
+
+
+AlignTimecodes::AlignTimecodes(MWindow *mwindow)
+ : BC_MenuItem(_("Align Timecodes"))
+{
+	this->mwindow = mwindow;
+}
+
+int AlignTimecodes::handle_event()
+{
+	mwindow->align_timecodes();
+	return 1;
+}
+
 
 LoadLayoutItem::LoadLayoutItem(LoadLayout *load_layout, const char *text, int idx, int hotkey)
  : BC_MenuItem(text, "", hotkey)