X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowedit.C;h=7710d4ada162471c62cb6c0d81b1fae6fd5156ed;hb=d26ed189093987978190ee07f485a4840746c13c;hp=a12321546dbd36aee6ce3c725e851ac211716e2c;hpb=95683646dce10ad3f6a8c8c9c9225c69f4841ec5;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C
index a1232154..7710d4ad 100644
--- a/cinelerra-5.1/cinelerra/mwindowedit.C
+++ b/cinelerra-5.1/cinelerra/mwindowedit.C
@@ -427,10 +427,8 @@ int MWindow::copy(double start, double end)
 	edl->copy(start, end, 0, 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, BC_PRIMARY_SELECTION);
+	gui->to_clipboard(file_string, file_length, SECONDARY_SELECTION);
 	save_backup();
 	return 0;
 }
@@ -443,10 +441,8 @@ int MWindow::copy_automation()
 	edl->tracks->copy_automation(start, end, &file, 0, 1);
 	const char *file_string = file.string();
 	long file_length = strlen(file_string);
-	gui->get_clipboard()->to_clipboard(file_string, file_length,
-		BC_PRIMARY_SELECTION);
-	gui->get_clipboard()->to_clipboard(file_string, file_length,
-		SECONDARY_SELECTION);
+	gui->to_clipboard(file_string, file_length, BC_PRIMARY_SELECTION);
+	gui->to_clipboard(file_string, file_length, SECONDARY_SELECTION);
 	return 0;
 }
 
@@ -458,10 +454,8 @@ int MWindow::copy_default_keyframe()
 	edl->tracks->copy_automation(start, end, &file, 1, 0);
 	const char *file_string = file.string();
 	long file_length = strlen(file_string);
-	gui->get_clipboard()->to_clipboard(file_string, file_length,
-		BC_PRIMARY_SELECTION);
-	gui->get_clipboard()->to_clipboard(file_string, file_length,
-		SECONDARY_SELECTION);
+	gui->to_clipboard(file_string, file_length, BC_PRIMARY_SELECTION);
+	gui->to_clipboard(file_string, file_length, SECONDARY_SELECTION);
 	return 0;
 }
 
@@ -1087,12 +1081,12 @@ void MWindow::paste()
 {
 	double start = edl->local_session->get_selectionstart();
 	//double end = edl->local_session->get_selectionend();
-	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];
+		char *string = new char[len];
 		undo->update_undo_before();
-		gui->get_clipboard()->from_clipboard(string, len, BC_PRIMARY_SELECTION);
+		gui->from_clipboard(string, len, BC_PRIMARY_SELECTION);
 		FileXML file;
 		file.read_from_string(string);
 		clear(0);
@@ -1153,15 +1147,11 @@ int MWindow::paste_assets(double position, Track *dest_track, int overwrite)
 }
 
 void MWindow::load_assets(ArrayList<Indexable*> *new_assets,
-	double position,
-	int load_mode,
-	Track *first_track,
-	RecordLabels *labels,
-	int edit_labels,
-	int edit_plugins,
-	int edit_autos,
-	int overwrite)
+	double position, int load_mode, Track *first_track, RecordLabels *labels,
+	int edit_labels, int edit_plugins, int edit_autos, int overwrite)
 {
+	if( load_mode == LOADMODE_RESOURCESONLY )
+		load_mode = LOADMODE_ASSETSONLY;
 const int debug = 0;
 if( debug ) printf("MWindow::load_assets %d\n", __LINE__);
 	if( position < 0 ) position = edl->local_session->get_selectionstart();
@@ -1209,14 +1199,12 @@ if( debug ) printf("MWindow::load_assets %d\n", __LINE__);
 
 int MWindow::paste_automation()
 {
-	int64_t len = gui->get_clipboard()->clipboard_len(SECONDARY_SELECTION);
+	int64_t len = gui->clipboard_len(BC_PRIMARY_SELECTION);
 
 	if( len ) {
 		undo->update_undo_before();
-		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);
 		FileXML file;
 		file.read_from_string(string);
 
@@ -1242,14 +1230,12 @@ int MWindow::paste_automation()
 
 int MWindow::paste_default_keyframe()
 {
-	int64_t len = gui->get_clipboard()->clipboard_len(SECONDARY_SELECTION);
+	int64_t len = gui->clipboard_len(BC_PRIMARY_SELECTION);
 
 	if( len ) {
 		undo->update_undo_before();
-		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);
 		FileXML file;
 		file.read_from_string(string);
 		double start = edl->local_session->get_selectionstart();
@@ -1444,7 +1430,8 @@ int MWindow::paste_edls(ArrayList<EDL*> *new_edls, int load_mode,
 		}
 //PRINT_TRACE
 // Insert edl
-		if( load_mode != LOADMODE_RESOURCESONLY ) {
+		if( load_mode != LOADMODE_RESOURCESONLY &&
+		    load_mode != LOADMODE_ASSETSONLY ) {
 // Insert labels
 //printf("MWindow::paste_edls %f %f\n", current_position, edl_length);
 			if( load_mode == LOADMODE_PASTE ||