X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Feditpopup.C;h=4150beee73da49c1aeb2573106e7b616e4db86f2;hb=81fc9cd689dd964a4736fa1f8986a64db6b4a937;hp=45d7d87a0a696e918e9fb337d97de799858c1b27;hpb=1529091cdf16df199a901aabe6e8fa1813a933af;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/editpopup.C b/cinelerra-5.1/cinelerra/editpopup.C
index 45d7d87a..4150beee 100644
--- a/cinelerra-5.1/cinelerra/editpopup.C
+++ b/cinelerra-5.1/cinelerra/editpopup.C
@@ -67,6 +67,8 @@ void EditPopup::create_objects()
 {
 	add_item(open_edl = new EditPopupOpenEDL(mwindow, this));
 	add_item(new EditPopupClearSelect(mwindow, this));
+	add_item(new EditPopupSelectEdits(mwindow, this));
+	add_item(new EditPopupDeselectEdits(mwindow, this));
 	add_item(new EditPopupCopy(mwindow, this));
 	add_item(new EditPopupCut(mwindow, this));
 	add_item(new EditPopupMute(mwindow, this));
@@ -79,6 +81,7 @@ void EditPopup::create_objects()
 	add_item(new EditPopupOverwritePlugins(mwindow, this));
 	add_item(new EditCollectEffects(mwindow, this));
 	add_item(new EditPasteEffects(mwindow, this));
+	add_item(new EditPopupTimecode(mwindow, this));
 }
 
 int EditPopup::activate_menu(Track *track, Edit *edit,
@@ -139,7 +142,7 @@ int EditPopupOpenEDL::handle_event()
 		eprintf(_("Edit is not EDL: %s"), edit_title);
 		return 1;
 	}
-	mwindow->stack_push(edl, idxbl, edit);
+	mwindow->stack_push(edl, idxbl);
 	return 1;
 }
 
@@ -158,6 +161,34 @@ int EditPopupClearSelect::handle_event()
 	return 1;
 }
 
+EditPopupSelectEdits::EditPopupSelectEdits(MWindow *mwindow, EditPopup *popup)
+ : BC_MenuItem(_("Select Edits"),_("Ctrl-Alt-'"),'\'')
+{
+	this->mwindow = mwindow;
+	this->popup = popup;
+	set_ctrl(1);
+	set_alt(1);
+}
+
+int EditPopupSelectEdits::handle_event()
+{
+	mwindow->select_edits(1);
+	return 1;
+}
+
+EditPopupDeselectEdits::EditPopupDeselectEdits(MWindow *mwindow, EditPopup *popup)
+ : BC_MenuItem(_("Deselect Edits"))
+{
+	this->mwindow = mwindow;
+	this->popup = popup;
+}
+
+int EditPopupDeselectEdits::handle_event()
+{
+	mwindow->select_edits(0);
+	return 1;
+}
+
 EditPopupCopy::EditPopupCopy(MWindow *mwindow, EditPopup *popup)
  : BC_MenuItem(_("Copy"),_("Ctrl-c"),'c')
 {
@@ -202,11 +233,12 @@ int EditPopupCut::handle_event()
 }
 
 EditPopupCutPack::EditPopupCutPack(MWindow *mwindow, EditPopup *popup)
- : BC_MenuItem(_("Cut pack"),_("Ctrl-z"),'z')
+ : BC_MenuItem(_("Cut pack"),_("Ctrl-Alt-z"),'z')
 {
 	this->mwindow = mwindow;
 	this->popup = popup;
 	set_ctrl(1);
+	set_alt();
 }
 
 int EditPopupCutPack::handle_event()
@@ -339,4 +371,32 @@ int EditPasteEffects::handle_event()
 	return 1;
 }
 
+EditPopupTimecode::EditPopupTimecode(MWindow *mwindow, EditPopup *popup)
+ : BC_MenuItem(_("Timecode"),_("Ctrl-!"),'!')
+{
+	this->mwindow = mwindow;
+	this->popup = popup;
+	set_ctrl(1);
+}
+
+int EditPopupTimecode::handle_event()
+{
+	if( mwindow->session->current_operation != NO_OPERATION ) return 1;
+	Edit *edit = popup->edit;
+	if( !edit || !edit->asset ) return 1;
+	Asset *asset = edit->asset;
+	double timecode = asset->timecode != -2 ? asset->timecode :
+		FFMPEG::get_timecode(asset->path,
+			edit->track->data_type, edit->channel,
+			mwindow->edl->session->frame_rate);
+	asset->timecode = timecode;
+	if( timecode >= 0 ) {
+		int64_t pos = edit->startproject + edit->startsource;
+		double position = edit->track->from_units(pos);
+		mwindow->set_timecode_offset(timecode - position);
+	}
+	else
+		mwindow->set_timecode_offset(0);
+	return 1;
+}