X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fclippopup.C;h=07ae7252fedd46e4749f085cb09b10aaceddfadc;hb=60f8df69db9ddd8148bfc41a17bb0955b52a45e6;hp=b8a235a5cedfbaff4b8ca8b4eb3087a0444f011c;hpb=8b0d4fea3dbf5321d0688eb75f25be77f751d003;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/clippopup.C b/cinelerra-5.1/cinelerra/clippopup.C
index b8a235a5..07ae7252 100644
--- a/cinelerra-5.1/cinelerra/clippopup.C
+++ b/cinelerra-5.1/cinelerra/clippopup.C
@@ -58,7 +58,7 @@ void ClipPopup::create_objects()
 	BC_MenuItem *menu_item;
 	BC_SubMenu *submenu;
 	add_item(info = new ClipPopupInfo(mwindow, this));
-	add_item(format = new AWindowListFormat(mwindow));
+	add_item(format = new AWindowListFormat(mwindow, gui));
 	add_item(new ClipPopupSort(mwindow, this));
 	add_item(view = new ClipPopupView(mwindow, this));
 	add_item(view_window = new ClipPopupViewWindow(mwindow, this));
@@ -137,16 +137,18 @@ ClipPopupInfo::~ClipPopupInfo()
 
 int ClipPopupInfo::handle_event()
 {
-	if(mwindow->session->drag_assets->total)
-	{
-		mwindow->awindow->asset_edit->edit_asset(
-			mwindow->session->drag_assets->values[0]);
+	int cur_x, cur_y;
+	popup->gui->get_abs_cursor(cur_x, cur_y, 0);
+
+	if( mwindow->session->drag_assets->total ) {
+		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)
-	{
+	if( mwindow->session->drag_clips->total ) {
 		popup->gui->awindow->clip_edit->edit_clip(
-			mwindow->session->drag_clips->values[0]);
+			mwindow->session->drag_clips->values[0], cur_x, cur_y);
 	}
 	return 1;
 }
@@ -165,7 +167,7 @@ ClipPopupSort::~ClipPopupSort()
 
 int ClipPopupSort::handle_event()
 {
-	mwindow->awindow->gui->sort_assets();
+	mwindow->awindow->gui->sort_assets(0);
 	return 1;
 }
 
@@ -184,17 +186,15 @@ ClipPopupView::~ClipPopupView()
 int ClipPopupView::handle_event()
 {
 	VWindow *vwindow = mwindow->get_viewer(1, DEFAULT_VWINDOW);
-	vwindow->gui->lock_window("ClipPopupView::handle_event");
 
-	if(mwindow->session->drag_assets->total)
+	if( mwindow->session->drag_assets->total )
 		vwindow->change_source(
 			mwindow->session->drag_assets->values[0]);
 	else
-	if(mwindow->session->drag_clips->total)
+	if( mwindow->session->drag_clips->total )
 		vwindow->change_source(
 			mwindow->session->drag_clips->values[0]);
 
-	vwindow->gui->unlock_window();
 	return 1;
 }
 
@@ -218,11 +218,11 @@ int ClipPopupViewWindow::handle_event()
 // TODO: create new vwindow or change current vwindow
 	vwindow->gui->lock_window("ClipPopupView::handle_event");
 
-	if(mwindow->session->drag_assets->total)
+	if( mwindow->session->drag_assets->total )
 		vwindow->change_source(
 			mwindow->session->drag_assets->values[0]);
 	else
-	if(mwindow->session->drag_clips->total)
+	if( mwindow->session->drag_clips->total )
 		vwindow->change_source(
 			mwindow->session->drag_clips->values[0]);
 
@@ -252,10 +252,8 @@ int ClipPopupCopy::handle_event()
 		edl->copy(start, end, 1, 0, 0, &file, "", 1);
 		const char *file_string = file.string();
 		long file_length = strlen(file_string);
-		gui->get_clipboard()->to_clipboard(file_string, file_length,
-			SECONDARY_SELECTION);
-		gui->get_clipboard()->to_clipboard(file_string, file_length,
-			BC_PRIMARY_SELECTION);
+		gui->to_clipboard(file_string, file_length, SECONDARY_SELECTION);
+		gui->to_clipboard(file_string, file_length, BC_PRIMARY_SELECTION);
 	}
 	gui->unlock_window(); 
 	return 1;
@@ -353,10 +351,10 @@ int ClipPasteToFolder::handle_event()
 {
 	MWindowGUI *gui = mwindow->gui;
 	gui->lock_window("ClipPasteToFolder::handle_event 1");
-	int64_t len = gui->get_clipboard()->clipboard_len(SECONDARY_SELECTION);
+	int64_t len = gui->clipboard_len(BC_PRIMARY_SELECTION);
 	if( len ) {
-		char *string = new char[len + 1];
-		gui->get_clipboard()->from_clipboard(string, len, BC_PRIMARY_SELECTION);
+		char *string = new char[len];
+		gui->from_clipboard(string, len, BC_PRIMARY_SELECTION);
 		const char *clip_header = "<EDL VERSION=";
 		if( !strncmp(clip_header, string, strlen(clip_header)) ) {
 			FileXML file;
@@ -397,8 +395,8 @@ ClipListMenu::~ClipListMenu()
 
 void ClipListMenu::create_objects()
 {
-	add_item(format = new AWindowListFormat(mwindow));
-	add_item(new AWindowListSort(mwindow));
+	add_item(format = new AWindowListFormat(mwindow, gui));
+	add_item(new AWindowListSort(mwindow, gui));
 	add_item(new ClipPasteToFolder(mwindow));
 	update();
 }