X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowedit.C;h=85b5f7439b1e94918e04d4955f3fb3e23b4c64cd;hb=8d1431081df60da0719db2c77e4c56830521c7e8;hp=8fba7bfc95d48b110516db5e6ef81c743d8e59df;hpb=65eb7d06c462c2caaa7fabcb8956add9e6b8abc7;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C
index 8fba7bfc..85b5f743 100644
--- a/cinelerra-5.1/cinelerra/mwindowedit.C
+++ b/cinelerra-5.1/cinelerra/mwindowedit.C
@@ -1084,7 +1084,7 @@ void MWindow::paste()
 	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->from_clipboard(string, len, BC_PRIMARY_SELECTION);
 		FileXML file;
@@ -1203,7 +1203,7 @@ int MWindow::paste_automation()
 
 	if( len ) {
 		undo->update_undo_before();
-		char *string = new char[len + 1];
+		char *string = new char[len];
 		gui->from_clipboard(string, len, BC_PRIMARY_SELECTION);
 		FileXML file;
 		file.read_from_string(string);
@@ -1234,7 +1234,7 @@ int MWindow::paste_default_keyframe()
 
 	if( len ) {
 		undo->update_undo_before();
-		char *string = new char[len + 1];
+		char *string = new char[len];
 		gui->from_clipboard(string, len, BC_PRIMARY_SELECTION);
 		FileXML file;
 		file.read_from_string(string);
@@ -2274,6 +2274,67 @@ void MWindow::remap_audio(int pattern)
 	}
 }
 
+void MWindow::set_proxy(int use_scaler, int new_scale,
+        ArrayList<Indexable*> *orig_assets, ArrayList<Indexable*> *proxy_assets)
+{
+	int orig_use_scaler = edl->session->proxy_use_scaler;
+	int orig_scale = edl->session->proxy_scale;
+// rescale to full size asset in read_frame
+	edl->session->proxy_use_scaler = use_scaler;
+	edl->session->proxy_scale = new_scale;
+
+	if( use_scaler ) {
+		for( int i=0; i<proxy_assets->size(); ++i ) {
+			Asset *proxy_asset = (Asset *)proxy_assets->get(i);
+			proxy_asset->width = orig_assets->get(i)->get_w();
+			proxy_asset->height = orig_assets->get(i)->get_h();
+		}
+		new_scale = 1;
+	}
+
+	if( !orig_use_scaler && new_scale != orig_scale ) {
+// project size
+		float orig_w = (float)edl->session->output_w * orig_scale;
+		float orig_h = (float)edl->session->output_h * orig_scale;
+		edl->session->output_w = Units::round(orig_w / new_scale);
+		edl->session->output_h = Units::round(orig_h / new_scale);
+
+// track sizes
+		for( Track *track=edl->tracks->first; track; track=track->next ) {
+			if( track->data_type != TRACK_VIDEO ) continue;
+			orig_w = (float)track->track_w * orig_scale;
+			orig_h = (float)track->track_h * orig_scale;
+			track->track_w = Units::round(orig_w / new_scale);
+			track->track_h = Units::round(orig_h / new_scale);
+			((MaskAutos*)track->automation->autos[AUTOMATION_MASK])->
+				set_proxy(orig_scale, new_scale);
+			((FloatAutos*)track->automation->autos[AUTOMATION_CAMERA_X])->
+				set_proxy(orig_scale, new_scale);
+			((FloatAutos*)track->automation->autos[AUTOMATION_CAMERA_Y])->
+				set_proxy(orig_scale, new_scale);
+			((FloatAutos*)track->automation->autos[AUTOMATION_PROJECTOR_X])->
+				set_proxy(orig_scale, new_scale);
+			((FloatAutos*)track->automation->autos[AUTOMATION_PROJECTOR_Y])->
+				set_proxy(orig_scale, new_scale);
+		}
+	}
+
+// change original assets to proxy assets
+	for( int i=0; i<proxy_assets->size(); i++ ) {
+		Asset *proxy_asset = edl->assets->update((Asset *)proxy_assets->get(i));
+// replace track contents
+		for( Track *track = edl->tracks->first; track; track = track->next ) {
+			if( track->data_type != TRACK_VIDEO ) continue;
+			for( Edit *edit = track->edits->first; edit; edit = edit->next ) {
+				if( !edit->asset ) continue;
+				if( !strcmp(edit->asset->path, orig_assets->get(i)->path) ) {
+					edit->asset = proxy_asset;
+				}
+			}
+		}
+	}
+}
+
 void MWindow::cut_commercials()
 {
 	undo->update_undo_before();