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

diff --git a/cinelerra-5.1/cinelerra/assetpopup.C b/cinelerra-5.1/cinelerra/assetpopup.C
index bc556ae6..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());
@@ -145,14 +150,13 @@ AssetPopupInfo::~AssetPopupInfo()
 int AssetPopupInfo::handle_event()
 {
 	int cur_x, cur_y;
-	popup->gui->get_abs_cursor_xy(cur_x, cur_y, 0);
-	
-	if( mwindow->session->drag_assets->total ) {
-		mwindow->awindow->asset_edit->edit_asset(
+	popup->gui->get_abs_cursor(cur_x, cur_y);
+	if( mwindow->session->drag_assets->size() ) {
+		AssetEdit *asset_edit = mwindow->awindow->get_asset_editor();
+		asset_edit->edit_asset(
 			mwindow->session->drag_assets->values[0], cur_x, cur_y);
 	}
-	else
-	if( mwindow->session->drag_clips->total ) {
+	else if( mwindow->session->drag_clips->size() ) {
 		popup->gui->awindow->clip_edit->edit_clip(
 			mwindow->session->drag_clips->values[0], cur_x, cur_y);
 	}
@@ -179,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;
 }
 
@@ -257,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"))
@@ -414,7 +483,7 @@ int AssetListCopy::handle_event()
 	}
 	*cp = 0;
 	int cur_x, cur_y;
-	gui->get_abs_cursor_xy(cur_x, cur_y, 0);
+	gui->get_abs_cursor(cur_x, cur_y, 0);
 	gui->unlock_window(); 
 
 	if( n ) {
@@ -432,30 +501,30 @@ int AssetListCopy::handle_event()
 AssetCopyDialog::AssetCopyDialog(AssetListCopy *copy)
  : BC_DialogThread()
 {
-        this->copy = copy;
+	this->copy = copy;
 	copy_window = 0;
 }
 
 void AssetCopyDialog::start(char *text, int x, int y)
 {
-        close_window();
-        this->text = text;
+	close_window();
+	this->text = text;
 	this->x = x;  this->y = y;
 	BC_DialogThread::start();
 }
 
 AssetCopyDialog::~AssetCopyDialog()
 {
-        close_window();
+	close_window();
 }
 
 BC_Window* AssetCopyDialog::new_gui()
 {
-        BC_DisplayInfo display_info;
+	BC_DisplayInfo display_info;
 
-        copy_window = new AssetCopyWindow(this);
-        copy_window->create_objects();
-        return copy_window;
+	copy_window = new AssetCopyWindow(this);
+	copy_window->create_objects();
+	return copy_window;
 }
 
 void AssetCopyDialog::handle_done_event(int result)
@@ -465,16 +534,16 @@ void AssetCopyDialog::handle_done_event(int result)
 
 void AssetCopyDialog::handle_close_event(int result)
 {
-        copy_window = 0;
+	copy_window = 0;
 }
 
 
 AssetCopyWindow::AssetCopyWindow(AssetCopyDialog *copy_dialog)
  : BC_Window(_(PROGRAM_NAME ": Copy File List"),
 	copy_dialog->x - 500/2, copy_dialog->y - 200/2,
-	500, 200, 500, 200, 0, 0, 1)
+	500, 200, 500, 200, 1, 0, 1)
 {
-        this->copy_dialog = copy_dialog;
+	this->copy_dialog = copy_dialog;
 }
 
 AssetCopyWindow::~AssetCopyWindow()
@@ -496,9 +565,18 @@ void AssetCopyWindow::create_objects()
 	file_list->create_objects();
 
 	add_subwindow(new BC_OKButton(this));
-        show_window();
+	show_window();
 }
 
+int AssetCopyWindow::resize_event(int w, int h)
+{
+	int fx = file_list->get_x(), fy = file_list->get_y(), pad = 5;
+	int text_w = w - fx - 10;
+	int text_h = h - fy - BC_OKButton::calculate_h() - pad;
+	int text_rows = BC_TextBox::pixels_to_rows(this, MEDIUMFONT, text_h);
+	file_list->reposition_window(fx, fy, text_w, text_rows);
+	return 0;
+}
 
 AssetListPaste::AssetListPaste(MWindow *mwindow, AWindowGUI *gui)
  : BC_MenuItem(_("Paste file list"))
@@ -515,11 +593,11 @@ AssetListPaste::~AssetListPaste()
 int AssetListPaste::handle_event()
 {
 	if( !paste_dialog )
-		paste_dialog->close_window();
-	else
 		paste_dialog = new AssetPasteDialog(this);
+	else
+		paste_dialog->close_window();
 	int cur_x, cur_y;
-	gui->get_abs_cursor_xy(cur_x, cur_y, 0);
+	gui->get_abs_cursor(cur_x, cur_y, 0);
 	paste_dialog->start(cur_x, cur_y);
 	return 1;
 }
@@ -527,20 +605,20 @@ int AssetListPaste::handle_event()
 AssetPasteDialog::AssetPasteDialog(AssetListPaste *paste)
  : BC_DialogThread()
 {
-        this->paste = paste;
+	this->paste = paste;
 	paste_window = 0;
 }
 
 AssetPasteDialog::~AssetPasteDialog()
 {
-        close_window();
+	close_window();
 }
 
 BC_Window* AssetPasteDialog::new_gui()
 {
-        paste_window = new AssetPasteWindow(this);
-        paste_window->create_objects();
-        return paste_window;
+	paste_window = new AssetPasteWindow(this);
+	paste_window->create_objects();
+	return paste_window;
 }
 
 void AssetPasteDialog::handle_done_event(int result)
@@ -569,14 +647,14 @@ void AssetPasteDialog::handle_done_event(int result)
 	result = mwindow->load_filenames(&path_list, LOADMODE_RESOURCESONLY, 0);
 	mwindow->gui->unlock_window();
 	path_list.remove_all_objects();
-        mwindow->save_backup();
-        mwindow->restart_brender();
+	mwindow->save_backup();
+	mwindow->restart_brender();
 	mwindow->session->changes_made = 1;
 }
 
 void AssetPasteDialog::handle_close_event(int result)
 {
-        paste_window = 0;
+	paste_window = 0;
 }
 
 void AssetPasteDialog::start(int x, int y)
@@ -588,9 +666,9 @@ void AssetPasteDialog::start(int x, int y)
 AssetPasteWindow::AssetPasteWindow(AssetPasteDialog *paste_dialog)
  : BC_Window(_(PROGRAM_NAME ": Paste File List"),
 	paste_dialog->x - 500/2, paste_dialog->y - 200/2,
-	500, 200, 500, 200, 0, 0, 1)
+	500, 200, 500, 200, 1, 0, 1)
 {
-        this->paste_dialog = paste_dialog;
+	this->paste_dialog = paste_dialog;
 }
 
 AssetPasteWindow::~AssetPasteWindow()
@@ -610,6 +688,16 @@ void AssetPasteWindow::create_objects()
 	file_list->create_objects();
 	add_subwindow(new BC_OKButton(this));
 	add_subwindow(new BC_CancelButton(this));
-        show_window();
+	show_window();
+}
+
+int AssetPasteWindow::resize_event(int w, int h)
+{
+	int fx = file_list->get_x(), fy = file_list->get_y(), pad = 5;
+	int text_w = w - fx - 10;
+	int text_h = h - fy - BC_OKButton::calculate_h() - pad;
+	int text_rows = BC_TextBox::pixels_to_rows(this, MEDIUMFONT, text_h);
+	file_list->reposition_window(fx, fy, text_w, text_rows);
+	return 0;
 }