X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowmove.C;h=2c0479bb947953c8f1383ea1035831ce999498f2;hp=2ee2a70a2bd4863f26b6d5cad6035fbbcce17e4d;hb=9ffdfbe8e6fa7daaad4dcfdd46b6ac7b6e7a47e8;hpb=b2d226c1f41e84bbb3af93ebc0aa89f98ec0fd52;ds=sidebyside

diff --git a/cinelerra-5.1/cinelerra/mwindowmove.C b/cinelerra-5.1/cinelerra/mwindowmove.C
index 2ee2a70a..2c0479bb 100644
--- a/cinelerra-5.1/cinelerra/mwindowmove.C
+++ b/cinelerra-5.1/cinelerra/mwindowmove.C
@@ -356,17 +356,13 @@ void MWindow::zoom_amp(int64_t zoom_amp)
 void MWindow::zoom_atrack(int64_t zoom)
 {
 	int64_t old_zoom = edl->local_session->zoom_atrack;
-// scale waveforms
-	edl->local_session->zoom_y = (int64_t)((float)edl->local_session->zoom_y *
-			zoom / old_zoom);
-	CLAMP(edl->local_session->zoom_y, MIN_AMP_ZOOM, MAX_AMP_ZOOM);
+	CLAMP(zoom, MIN_TRACK_ZOOM, MAX_TRACK_ZOOM);
+	edl->local_session->zoom_atrack = zoom;
 
-// scale tracks
 	edl->local_session->zoom_atrack = zoom;
 	for( Track *track= edl->tracks->first; track; track=track->next ) {
 		if( track->data_type != TRACK_AUDIO ) continue;
-		track->data_h = track->data_h * zoom / old_zoom;
-		bclamp(track->data_h, MIN_TRACK_ZOOM, MAX_TRACK_ZOOM);
+		track->data_h = zoom;
 	}
 // shift row position
 	for( int i=0; i<TOTAL_PANES; ++i ) edl->local_session->track_start[i] =
@@ -378,12 +374,12 @@ void MWindow::zoom_atrack(int64_t zoom)
 void MWindow::zoom_vtrack(int64_t zoom)
 {
 	int64_t old_zoom = edl->local_session->zoom_vtrack;
-// scale tracks
+	CLAMP(zoom, MIN_TRACK_ZOOM, MAX_TRACK_ZOOM);
 	edl->local_session->zoom_vtrack = zoom;
+
 	for( Track *track= edl->tracks->first; track; track=track->next ) {
 		if( track->data_type != TRACK_VIDEO ) continue;
-		track->data_h = track->data_h * zoom / old_zoom;
-		bclamp(track->data_h, MIN_TRACK_ZOOM, MAX_TRACK_ZOOM);
+		track->data_h = zoom;
 	}
 // shift row position
 	for( int i=0; i<TOTAL_PANES; ++i ) edl->local_session->track_start[i] =