X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Feditpopup.C;h=f20f9b95850b317614290869e0740841e52461c0;hb=8429c33b548c1493b81793e5568b53dcd29ecb7c;hp=fc1da9d09c7acf518e5cb0ca6e5be287ee6a5c13;hpb=0d37fdc03a4c5eeffef41d15490ebc528079ea52;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/editpopup.C b/cinelerra-5.1/cinelerra/editpopup.C
index fc1da9d0..f20f9b95 100644
--- a/cinelerra-5.1/cinelerra/editpopup.C
+++ b/cinelerra-5.1/cinelerra/editpopup.C
@@ -24,11 +24,12 @@
 #include "awindow.h"
 #include "awindowgui.h"
 #include "edit.h"
+#include "edits.h"
 #include "editpopup.h"
-#include "cache.h"
 #include "edl.h"
 #include "edlsession.h"
 #include "file.h"
+#include "keys.h"
 #include "language.h"
 #include "localsession.h"
 #include "mainerror.h"
@@ -36,15 +37,10 @@
 #include "mwindow.h"
 #include "mwindowgui.h"
 #include "plugindialog.h"
-#include "preferences.h"
-#include "renderengine.h"
 #include "resizetrackthread.h"
 #include "track.h"
 #include "tracks.h"
 #include "trackcanvas.h"
-#include "transportque.h"
-#include "vframe.h"
-#include "vrender.h"
 
 #include <string.h>
 
@@ -66,14 +62,9 @@ void EditPopup::create_objects()
 	add_item(new EditMoveTrackDown(mwindow, this));
 	add_item(new EditPopupDeleteTrack(mwindow, this));
 	add_item(new EditPopupAddTrack(mwindow, this));
-//	add_item(new EditPopupTitle(mwindow, this));
-	EditSnapshot *edit_snapshot;
-	SnapshotSubMenu *snapshot_submenu;
-	add_item(edit_snapshot = new EditSnapshot(mwindow, this));
-	edit_snapshot->add_submenu(snapshot_submenu = new SnapshotSubMenu(edit_snapshot));
-	snapshot_submenu->add_submenuitem(new SnapshotMenuItem(snapshot_submenu, _("png"),  SNAPSHOT_PNG));
-	snapshot_submenu->add_submenuitem(new SnapshotMenuItem(snapshot_submenu, _("jpeg"), SNAPSHOT_JPEG));
-	snapshot_submenu->add_submenuitem(new SnapshotMenuItem(snapshot_submenu, _("tiff"), SNAPSHOT_TIFF));
+	add_item(new EditPopupFindAsset(mwindow, this));
+	add_item(new EditPopupTitle(mwindow, this));
+	add_item(new EditPopupShow(mwindow, this));
 	resize_option = 0;
 	matchsize_option = 0;
 }
@@ -98,13 +89,6 @@ int EditPopup::update(Track *track, Edit *edit)
 }
 
 
-
-
-
-
-
-
-
 EditAttachEffect::EditAttachEffect(MWindow *mwindow, EditPopup *popup)
  : BC_MenuItem(_("Attach effect..."))
 {
@@ -232,100 +216,147 @@ int EditPopupAddTrack::handle_event()
 	return 1;
 }
 
+EditPopupFindAsset::EditPopupFindAsset(MWindow *mwindow, EditPopup *popup)
+ : BC_MenuItem(_("Find in Resources"))
+{
+	this->mwindow = mwindow;
+	this->popup = popup;
+}
+
+int EditPopupFindAsset::handle_event()
+{
+	Edit *edit = popup->edit;
+	if( edit ) {
+		Indexable *idxbl = (Indexable *)edit->asset;
+		if( !idxbl ) idxbl = (Indexable *)edit->nested_edl;
+		if( idxbl ) {
+			AWindowGUI *agui = mwindow->awindow->gui;
+			agui->lock_window("EditPopupFindAsset::handle_event");
+			AssetPicon *picon = 0;
+			for( int i=0, n=agui->assets.size(); i<n; ++i ) {
+				AssetPicon *ap = (AssetPicon *)agui->assets[i];
+				int found = ap->indexable && ( idxbl == ap->indexable ||
+					!strcmp(idxbl->path, ap->indexable->path) );
+				if( found && !picon ) picon = ap;
+				ap->set_selected(found);
+			}
+			if( picon ) {
+				int selected_folder = picon->indexable->awindow_folder;
+				mwindow->edl->session->awindow_folder = selected_folder;
+				for( int i=0,n=agui->folders.size(); i<n; ++i ) {
+					AssetPicon *folder_item = (AssetPicon *)agui->folders[i];
+					int selected = folder_item->foldernum == selected_folder ? 1 : 0;
+					folder_item->set_selected(selected);
+				}
+			}
+			agui->unlock_window();
+			agui->async_update_assets();
+		}
+	}
+	return 1;
+}
+
 
 EditPopupTitle::EditPopupTitle(MWindow *mwindow, EditPopup *popup)
  : BC_MenuItem(_("User title..."))
 {
 	this->mwindow = mwindow;
 	this->popup = popup;
-	window = 0;
+	dialog_thread = new EditTitleDialogThread(this);
 }
 
 EditPopupTitle::~EditPopupTitle()
 {
-	delete popup;
+	delete dialog_thread;
 }
 
 int EditPopupTitle::handle_event()
 {
-	int result;
-
-	Track *trc = mwindow->session->track_highlighted;
-
-	if (trc && trc->record)
-	{
-		Edit *edt = mwindow->session->edit_highlighted;
-		if(!edt) return 1;
-
-		window = new EditPopupTitleWindow (mwindow, popup);
-		window->create_objects();
-		result = window->run_window();
+	if( popup->edit ) {
+		dialog_thread->close_window();
+		int wx = mwindow->gui->get_abs_cursor_x(0) - 400 / 2;
+		int wy = mwindow->gui->get_abs_cursor_y(0) - 500 / 2;
+		dialog_thread->start(wx, wy);
+	}
+	return 1;
+}
 
+void EditTitleDialogThread::start(int wx, int wy)
+{
+	this->wx = wx;  this->wy = wy;
+	BC_DialogThread::start();
+}
 
-		if(!result && edt)
-		{
-			strcpy(edt->user_title, window->title_text->get_text());
-		}
+EditTitleDialogThread::EditTitleDialogThread(EditPopupTitle *edit_title)
+{
+	this->edit_title = edit_title;
+	window = 0;
+}
+EditTitleDialogThread::~EditTitleDialogThread()
+{
+	close_window();
+}
 
-		delete window;
-		window = 0;
-	}
+BC_Window* EditTitleDialogThread::new_gui()
+{
+	MWindow *mwindow = edit_title->mwindow;
+	EditPopup *popup = edit_title->popup;
+	window = new EditPopupTitleWindow(mwindow, popup, wx, wy);
+	window->create_objects();
+	return window;
+}
 
-	return 1;
+void EditTitleDialogThread::handle_close_event(int result)
+{
+	window = 0;
 }
 
+void EditTitleDialogThread::handle_done_event(int result)
+{
+	if( result ) return;
+	MWindow *mwindow = edit_title->mwindow;
+	EditPopup *popup = edit_title->popup;
+	strcpy(popup->edit->user_title, window->title_text->get_text());
+	mwindow->gui->lock_window("EditTitleDialogThread::handle_done_event");
+	mwindow->gui->draw_canvas(1, 0);
+	mwindow->gui->flash_canvas(1);
+	mwindow->gui->unlock_window();
+}
 
-EditPopupTitleWindow::EditPopupTitleWindow (MWindow *mwindow, EditPopup *popup)
- : BC_Window (_(PROGRAM_NAME ": Set edit title"),
-	mwindow->gui->get_abs_cursor_x(0) - 400 / 2,
-	mwindow->gui->get_abs_cursor_y(0) - 500 / 2,
-	300,
-	100,
-	300,
-	100,
-	0,
-	0,
-	1)
+EditPopupTitleWindow::EditPopupTitleWindow(MWindow *mwindow,
+		EditPopup *popup, int wx, int wy)
+ : BC_Window(_(PROGRAM_NAME ": Set edit title"), wx, wy,
+	300, 130, 300, 130, 0, 0, 1)
 {
 	this->mwindow = mwindow;
 	this->popup = popup;
-	this->edt = this->mwindow->session->edit_highlighted;
-	if(this->edt)
-	{
-		strcpy(new_text, this->edt->user_title);
-	}
+	strcpy(new_text, !popup->edit ? "" : popup->edit->user_title);
 }
 
 EditPopupTitleWindow::~EditPopupTitleWindow()
 {
 }
 
-int EditPopupTitleWindow::close_event()
-{
-	set_done(1);
-	return 1;
-}
-
 void EditPopupTitleWindow::create_objects()
 {
-	int x = 5;
-	int y = 10;
-
-	add_subwindow (new BC_Title (x, y, _("User title")));
-	add_subwindow (title_text = new EditPopupTitleText (this,
-		mwindow, x, y + 20));
+	lock_window("EditPopupTitleWindow::create_objects");
+	int x = 10, y = 10;
+	add_subwindow(new BC_Title(x, y, _("User title:")));
+	title_text = new EditPopupTitleText(this, mwindow, x+15, y+20, new_text);
+	add_subwindow(title_text);
 	add_tool(new BC_OKButton(this));
 	add_tool(new BC_CancelButton(this));
 
 
 	show_window();
 	flush();
+	unlock_window();
 }
 
 
-EditPopupTitleText::EditPopupTitleText (EditPopupTitleWindow *window,
-	MWindow *mwindow, int x, int y)
- : BC_TextBox(x, y, 250, 1, (char*)(window->edt ? window->edt->user_title : ""))
+EditPopupTitleText::EditPopupTitleText(EditPopupTitleWindow *window,
+	MWindow *mwindow, int x, int y, const char *text)
+ : BC_TextBox(x, y, 250, 1, text)
 {
 	this->window = window;
 	this->mwindow = mwindow;
@@ -337,120 +368,141 @@ EditPopupTitleText::~EditPopupTitleText()
 
 int EditPopupTitleText::handle_event()
 {
+	if( get_keypress() == RETURN )
+		window->set_done(0);
 	return 1;
 }
 
 
-
-EditSnapshot::EditSnapshot(MWindow *mwindow, EditPopup *popup)
- : BC_MenuItem(_("Snapshot..."))
+EditPopupShow::EditPopupShow(MWindow *mwindow, EditPopup *popup)
+ : BC_MenuItem(_("Show edit"))
 {
 	this->mwindow = mwindow;
 	this->popup = popup;
+	dialog_thread = new EditShowDialogThread(this);
 }
 
-EditSnapshot::~EditSnapshot()
+EditPopupShow::~EditPopupShow()
 {
+	delete dialog_thread;
 }
 
-SnapshotSubMenu::SnapshotSubMenu(EditSnapshot *edit_snapshot)
+int EditPopupShow::handle_event()
 {
-	this->edit_snapshot = edit_snapshot;
+	if( popup->edit ) {
+		dialog_thread->close_window();
+		int wx = mwindow->gui->get_abs_cursor_x(0) - 400 / 2;
+		int wy = mwindow->gui->get_abs_cursor_y(0) - 500 / 2;
+		dialog_thread->start(wx, wy);
+	}
+	return 1;
 }
 
-SnapshotSubMenu::~SnapshotSubMenu()
+void EditShowDialogThread::start(int wx, int wy)
 {
+	this->wx = wx;  this->wy = wy;
+	BC_DialogThread::start();
 }
 
-SnapshotMenuItem::SnapshotMenuItem(SnapshotSubMenu *submenu, const char *text, int mode)
- : BC_MenuItem(text)
+EditShowDialogThread::EditShowDialogThread(EditPopupShow *edit_show)
 {
-	this->submenu = submenu;
-	this->mode = mode;
+	this->edit_show = edit_show;
+	window = 0;
+}
+EditShowDialogThread::~EditShowDialogThread()
+{
+	close_window();
 }
 
-SnapshotMenuItem::~SnapshotMenuItem()
+BC_Window* EditShowDialogThread::new_gui()
 {
+	MWindow *mwindow = edit_show->mwindow;
+	EditPopup *popup = edit_show->popup;
+	window = new EditPopupShowWindow(mwindow, popup, wx, wy);
+	window->create_objects();
+	return window;
 }
 
-int SnapshotMenuItem::handle_event()
+void EditShowDialogThread::handle_close_event(int result)
 {
-	MWindow *mwindow = submenu->edit_snapshot->mwindow;
-	EDL *edl = mwindow->edl;
-	if( !edl->have_video() ) return 1;
+	window = 0;
+}
 
-	Preferences *preferences = mwindow->preferences;
-	char filename[BCTEXTLEN];
-	static const char *exts[] = { "png", "jpg", "tif" };
-	time_t tt;     time(&tt);
-	struct tm tm;  localtime_r(&tt,&tm);
-	sprintf(filename,"%s/snap_%04d%02d%02d-%02d%02d%02d.%s",
-		preferences->snapshot_path, 1900+tm.tm_year,tm.tm_mon,tm.tm_mday,
-		tm.tm_hour,tm.tm_min,tm.tm_sec, exts[mode]);
-	int fw = edl->get_w(), fh = edl->get_h();
-	int fcolor_model = edl->session->color_model;
+EditPopupShowWindow::EditPopupShowWindow(MWindow *mwindow,
+		EditPopup *popup, int wx, int wy)
+ : BC_Window(_(PROGRAM_NAME ": Show edit"), wx, wy,
+	300, 220, 300, 220, 0, 0, 1)
+{
+	this->mwindow = mwindow;
+	this->popup = popup;
+}
 
-	Asset *asset = new Asset(filename);
-	switch( mode ) {
-	case SNAPSHOT_PNG:
-		asset->format = FILE_PNG;
-		asset->png_use_alpha = 1;
-		break;
-	case SNAPSHOT_JPEG:
-		asset->format = FILE_JPEG;
-		asset->jpeg_quality = 90;
-		break;
-	case SNAPSHOT_TIFF:
-		asset->format = FILE_TIFF;
-		asset->tiff_cmodel = 0;
-		asset->tiff_compression = 0;
-		break;
-	}
-	asset->width = fw;
-	asset->height = fh;
-	asset->audio_data = 0;
-	asset->video_data = 1;
-	asset->video_length = 1;
-	asset->layers = 1;
-
-	File file;
-	int processors = preferences->project_smp + 1;
-	if( processors > 8 ) processors = 8;
-	file.set_processors(processors);
-	int ret = file.open_file(preferences, asset, 0, 1);
-	if( !ret ) {
-		file.start_video_thread(1, fcolor_model,
-			processors > 1 ? 2 : 1, 0);
-		VFrame ***frames = file.get_video_buffer();
-		VFrame *frame = frames[0][0];
-		TransportCommand command;
-		//command.command = audio_tracks ? NORMAL_FWD : CURRENT_FRAME;
-		command.command = CURRENT_FRAME;
-		command.get_edl()->copy_all(edl);
-		command.change_type = CHANGE_ALL;
-		command.realtime = 0;
-
-		RenderEngine render_engine(0, preferences, 0, 0);
-		CICache video_cache(preferences);
-		render_engine.set_vcache(&video_cache);
-		render_engine.arm_command(&command);
-
-		double position = edl->local_session->get_selectionstart(1);
-		int64_t source_position = (int64_t)(position * edl->get_frame_rate());
-		int ret = render_engine.vrender->process_buffer(frame, source_position, 0);
-		if( !ret )
-			ret = file.write_video_buffer(1);
-		file.close_file();
-	}
-	if( !ret ) {
-		asset->awindow_folder = AW_MEDIA_FOLDER;
-		mwindow->edl->assets->append(asset);
-		mwindow->awindow->gui->async_update_assets();
-	}
-	else {
-		eprintf("snapshot render failed");
-		asset->remove_user();
-	}
-	return 1;
+EditPopupShowWindow::~EditPopupShowWindow()
+{
+}
+
+void EditPopupShowWindow::create_objects()
+{
+	lock_window("EditPopupShowWindow::create_objects");
+	int x = 10, y = 10;
+	BC_Title *title;
+	char text[BCTEXTLEN];
+	Track *track = popup->track;
+	Edit *edit = popup->edit;
+	sprintf(text, _("Track %d:"), mwindow->edl->tracks->number_of(track)+1);
+	add_subwindow(title = new BC_Title(x, y, text));
+	int x1 = x + title->get_w() + 10;
+	int tw = get_w() - x1 - 20;
+	truncate_text(text, track->title, tw);
+	add_subwindow(new BC_Title(x1, y, text));
+	y += title->get_h() + 5;
+	sprintf(text, _("Edit %d:"), track->edits->number_of(edit)+1);
+	add_subwindow(title = new BC_Title(x, y, text));
+	char edit_title[BCTEXTLEN];
+	edit->get_title(edit_title);
+	truncate_text(text, edit_title, tw);
+	add_subwindow(new BC_Title(x1, y, text));
+	y += title->get_h() + 5;
+
+	EDLSession *session = mwindow->edl->session;
+	int time_format = session->time_format;
+	int sample_rate = session->sample_rate;
+	double frame_rate = session->frame_rate;
+	double frames_per_foot = session->frames_per_foot;
+
+	double startsource = track->from_units(edit->startsource);
+	double startproject = track->from_units(edit->startproject);
+	double length = track->from_units(edit->length);
+
+	char text_startsource[BCSTRLEN];
+	char text_startproject[BCSTRLEN];
+	char text_length[BCSTRLEN];
+	sprintf(text, _("StartSource: %s\nStartProject: %s\nLength: %s\n"),
+		Units::totext(text_startsource, startsource,
+			time_format, sample_rate, frame_rate, frames_per_foot),
+		Units::totext(text_startproject, startproject,
+			time_format, sample_rate, frame_rate, frames_per_foot),
+		Units::totext(text_length, length,
+			time_format, sample_rate, frame_rate, frames_per_foot));
+	show_text = new EditPopupShowText(this, mwindow, x+15, y+10, text);
+	add_subwindow(show_text);
+	add_tool(new BC_OKButton(this));
+
+	show_window();
+	flush();
+	unlock_window();
+}
+
+
+EditPopupShowText::EditPopupShowText(EditPopupShowWindow *window,
+	MWindow *mwindow, int x, int y, const char *text)
+ : BC_TextBox(x, y, 250, 4, text)
+{
+	this->window = window;
+	this->mwindow = mwindow;
+}
+
+EditPopupShowText::~EditPopupShowText()
+{
 }