X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fassetpopup.C;h=677b8bab4093b833315fa59ef78f272b19695786;hb=a6369311556cc1e1877142181d8606e4f68aa803;hp=24304c724b8cd7e6d6477a6539f137abb3529ed0;hpb=55ccff122957ddfaa871cf8f251cfe866732c870;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/assetpopup.C b/cinelerra-5.1/cinelerra/assetpopup.C
index 24304c72..677b8bab 100644
--- a/cinelerra-5.1/cinelerra/assetpopup.C
+++ b/cinelerra-5.1/cinelerra/assetpopup.C
@@ -44,6 +44,7 @@
 #include "tracks.h"
 #include "vwindow.h"
 #include "vwindowgui.h"
+#include "zwindow.h"
 
 
 AssetPopup::AssetPopup(MWindow *mwindow, AWindowGUI *gui)
@@ -63,10 +64,14 @@ void AssetPopup::create_objects()
 	BC_SubMenu *submenu;
 	add_item(info = new AssetPopupInfo(mwindow, this));
 	add_item(format = new AWindowListFormat(mwindow, gui));
-	add_item(new AssetPopupSort(mwindow, this));
+	add_item(menu_item = new BC_MenuItem(_("Sort...")));
+	menu_item->add_submenu(submenu = new BC_SubMenu());
+	submenu->add_submenuitem(new AssetPopupSortNames(mwindow, this));
+	submenu->add_submenuitem(new AssetPopupSortTimes(mwindow, this));
 	add_item(index = new AssetPopupBuildIndex(mwindow, this));
 	add_item(view = new AssetPopupView(mwindow, this));
 	add_item(view_window = new AssetPopupViewWindow(mwindow, this));
+	add_item(mixer = new AssetPopupMixer(mwindow, this));
 	add_item(new AssetPopupPaste(mwindow, this));
 	add_item(menu_item = new BC_MenuItem(_("Match...")));
 	menu_item->add_submenu(submenu = new BC_SubMenu());
@@ -178,20 +183,37 @@ int AssetPopupBuildIndex::handle_event()
 }
 
 
-AssetPopupSort::AssetPopupSort(MWindow *mwindow, AssetPopup *popup)
- : BC_MenuItem(_("Sort items"))
+AssetPopupSortNames::AssetPopupSortNames(MWindow *mwindow, AssetPopup *popup)
+ : BC_MenuItem(_("Sort names"))
 {
 	this->mwindow = mwindow;
 	this->popup = popup;
 }
 
-AssetPopupSort::~AssetPopupSort()
+AssetPopupSortNames::~AssetPopupSortNames()
 {
 }
 
-int AssetPopupSort::handle_event()
+int AssetPopupSortNames::handle_event()
 {
-	mwindow->awindow->gui->sort_assets();
+	mwindow->awindow->gui->sort_assets(0);
+	return 1;
+}
+
+AssetPopupSortTimes::AssetPopupSortTimes(MWindow *mwindow, AssetPopup *popup)
+ : BC_MenuItem(_("Sort times"))
+{
+	this->mwindow = mwindow;
+	this->popup = popup;
+}
+
+AssetPopupSortTimes::~AssetPopupSortTimes()
+{
+}
+
+int AssetPopupSortTimes::handle_event()
+{
+	mwindow->awindow->gui->sort_assets(1);
 	return 1;
 }
 
@@ -256,6 +278,54 @@ int AssetPopupViewWindow::handle_event()
 	return 1;
 }
 
+AssetPopupMixer::AssetPopupMixer(MWindow *mwindow, AssetPopup *popup)
+ : BC_MenuItem(_("Open Mixers"))
+{
+	this->mwindow = mwindow;
+	this->popup = popup;
+}
+
+AssetPopupMixer::~AssetPopupMixer()
+{
+}
+
+int AssetPopupMixer::handle_event()
+{
+	ArrayList<ZWindow *>new_mixers;
+
+	mwindow->select_zwindow(0);
+	for( int i=0; i<mwindow->session->drag_assets->total; ++i ) {
+		Indexable *indexable = mwindow->session->drag_assets->values[i];
+		ArrayList<Indexable*> new_assets;
+		new_assets.append(indexable);
+		Track *track = mwindow->edl->tracks->last;
+		mwindow->load_assets(&new_assets, -1, LOADMODE_NEW_TRACKS, 0, 0, 0, 0, 0, 0);
+		track = !track ? mwindow->edl->tracks->first : track->next;
+		Mixer *mixer = 0;
+		ZWindow *zwindow = mwindow->get_mixer(mixer);
+		while( track ) {
+			track->play = track->record = 0;
+			if( track->data_type == TRACK_VIDEO ) {
+				sprintf(track->title, _("Mixer %d"), zwindow->idx);
+			}
+			mixer->mixer_ids.append(track->get_mixer_id());
+			track = track->next;
+		}
+		char *path = indexable->path;
+		char *tp = strrchr(path, '/');
+		if( !tp ) tp = path; else ++tp;
+		zwindow->set_title(tp);
+		new_mixers.append(zwindow);
+	}
+
+	mwindow->tile_mixers();
+	for( int i=0; i<new_mixers.size(); ++i )
+		new_mixers[i]->start();
+
+	mwindow->refresh_mixers();
+	mwindow->resync_guis();
+	return 1;
+}
 
 AssetPopupPaste::AssetPopupPaste(MWindow *mwindow, AssetPopup *popup)
  : BC_MenuItem(_("Paste"))