X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Feditpopup.C;h=694c2d2a6101bfbbc148cf47514ddb52beefb9d2;hb=b402ed7f93de4c98e6651483eb8561cf1c37ec9a;hp=9dccdd06a85c70df923ea29b5029ac8e5401f578;hpb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/editpopup.C b/cinelerra-5.1/cinelerra/editpopup.C
index 9dccdd06..694c2d2a 100644
--- a/cinelerra-5.1/cinelerra/editpopup.C
+++ b/cinelerra-5.1/cinelerra/editpopup.C
@@ -19,9 +19,18 @@
  *
  */
 
+#include "asset.h"
+#include "assets.h"
+#include "awindow.h"
+#include "awindowgui.h"
 #include "edit.h"
 #include "editpopup.h"
+#include "edl.h"
+#include "edlsession.h"
+#include "file.h"
 #include "language.h"
+#include "localsession.h"
+#include "mainerror.h"
 #include "mainsession.h"
 #include "mwindow.h"
 #include "mwindowgui.h"
@@ -31,15 +40,10 @@
 #include "tracks.h"
 #include "trackcanvas.h"
 
-
 #include <string.h>
 
 EditPopup::EditPopup(MWindow *mwindow, MWindowGUI *gui)
- : BC_PopupMenu(0,
-		0,
-		0,
-		"",
-		0)
+ : BC_PopupMenu(0, 0, 0, "", 0)
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
@@ -58,6 +62,7 @@ void EditPopup::create_objects()
 	add_item(new EditPopupAddTrack(mwindow, this));
 //	add_item(new EditPopupTitle(mwindow, this));
 	resize_option = 0;
+	matchsize_option = 0;
 }
 
 int EditPopup::update(Track *track, Edit *edit)
@@ -103,10 +108,8 @@ EditAttachEffect::~EditAttachEffect()
 int EditAttachEffect::handle_event()
 {
 	dialog_thread->start_window(popup->track,
-		0,
-		_(PROGRAM_NAME ": Attach Effect"),
-		0,
-		popup->track->data_type);
+		0, _(PROGRAM_NAME ": Attach Effect"),
+		0, popup->track->data_type);
 	return 1;
 }
 
@@ -144,8 +147,6 @@ int EditMoveTrackDown::handle_event()
 }
 
 
-
-
 EditPopupResize::EditPopupResize(MWindow *mwindow, EditPopup *popup)
  : BC_MenuItem(_("Resize track..."))
 {
@@ -165,10 +166,6 @@ int EditPopupResize::handle_event()
 }
 
 
-
-
-
-
 EditPopupMatchSize::EditPopupMatchSize(MWindow *mwindow, EditPopup *popup)
  : BC_MenuItem(_("Match output size"))
 {
@@ -186,11 +183,6 @@ int EditPopupMatchSize::handle_event()
 }
 
 
-
-
-
-
-
 EditPopupDeleteTrack::EditPopupDeleteTrack(MWindow *mwindow, EditPopup *popup)
  : BC_MenuItem(_("Delete track"))
 {
@@ -204,10 +196,6 @@ int EditPopupDeleteTrack::handle_event()
 }
 
 
-
-
-
-
 EditPopupAddTrack::EditPopupAddTrack(MWindow *mwindow, EditPopup *popup)
  : BC_MenuItem(_("Add track"))
 {
@@ -232,10 +220,6 @@ int EditPopupAddTrack::handle_event()
 }
 
 
-
-
-
-
 EditPopupTitle::EditPopupTitle(MWindow *mwindow, EditPopup *popup)
  : BC_MenuItem(_("User title..."))
 {
@@ -343,9 +327,3 @@ int EditPopupTitleText::handle_event()
 	return 1;
 }
 
-
-
-
-
-
-