X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fresourcepixmap.C;h=c65d1b952d83713c34e674475ce095e457b6163c;hb=83c58d6d78f6bf0d1d1fd4cfba8654906fe6ec29;hp=66073a0838cad41c2b89699666c53ee6a2dc6036;hpb=8cad02a7b02e4a8543bc5514892b51aed877a193;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/resourcepixmap.C b/cinelerra-5.1/cinelerra/resourcepixmap.C
index 66073a08..c65d1b95 100644
--- a/cinelerra-5.1/cinelerra/resourcepixmap.C
+++ b/cinelerra-5.1/cinelerra/resourcepixmap.C
@@ -293,7 +293,7 @@ void ResourcePixmap::draw_title(TrackCanvas *canvas,
 // coords relative to pixmap
 	int64_t total_x = edit_x - pixmap_x, total_w = edit_w;
 	int64_t x = total_x, w = total_w;
-	int left_margin = 10;
+	int left_margin = xS(10);
 
 	if( x < 0 ) { w -= -x; x = 0; }
 	if( w > pixmap_w ) w -= w - pixmap_w;
@@ -316,7 +316,7 @@ void ResourcePixmap::draw_title(TrackCanvas *canvas,
 	text_x = MAX(left_margin, text_x);
 //printf("ResourcePixmap::draw_title 1 %d\n", text_x);
 	canvas->draw_text(text_x, // 2,
-		canvas->get_text_ascent(mwindow->theme->title_font) + 2,
+		canvas->get_text_ascent(mwindow->theme->title_font) + yS(2),
 		title, strlen(title), this);
 }
 
@@ -478,8 +478,8 @@ void ResourcePixmap::draw_audio_source(TrackCanvas *canvas, Edit *edit, int x, i
 			int y1 = center_pixel - sample * scale_y / 2;
 			int y2 = CLIP(y1, 0, y_max);
 
-			for( int x0=0; x0<w; ++x0 ) {
-				int x1 = x0 + x, x2 = x1 + 1;
+			for( int x1=x; x1<w; ++x1 ) {
+				int x2 = x1 + 1;
 				edit_position = (x1 + pixmap_x - edit_x) * project_zoom;
 				int64_t speed_position = edit->startsource;
 				speed_position += !speed_autos ? edit_position :
@@ -492,7 +492,10 @@ void ResourcePixmap::draw_audio_source(TrackCanvas *canvas, Edit *edit, int x, i
 				y1 = center_pixel - sample * scale_y / 2;
 				y2 = CLIP(y1, 0, y_max);
 //printf("ResourcePixmap::draw_audio_source %d %d %d\n", __LINE__, y1, y2);
-				canvas->draw_line(x0, y0, x2, y2, this);
+				if( !rect_audio )
+					canvas->draw_line(x1, y0, x2, y2, this);
+				else
+					canvas->draw_line(x2, center_pixel, x2, y2, this);
 			}
 		}
 
@@ -540,7 +543,7 @@ void ResourcePixmap::draw_audio_source(TrackCanvas *canvas, Edit *edit, int x, i
 					y_lo = y1;  y_hi = y2;
 				}
 				prev_y1 = y1;  prev_y2 = y2;
-				canvas->draw_line(x, y_lo, x, y_hi, this);
+				canvas->draw_line(x, !rect_audio ? y_lo : center_pixel, x, y_hi, this);
 //printf("ResourcePixmap::draw_audio_source %d %d %d %d\n", __LINE__, x, y1, y2);
 				mwindow->wave_cache->unlock();
 			}
@@ -576,7 +579,7 @@ void ResourcePixmap::draw_wave(TrackCanvas *canvas,
 	CLAMP(y1, top_pixel, bottom_pixel);
 	CLAMP(y2, top_pixel, bottom_pixel);
 	canvas->set_color(mwindow->theme->audio_color);
-	canvas->draw_line(x, y1, x, y2, this);
+	canvas->draw_line(x, !rect_audio ? y1 : bottom_pixel, x, y2, this);
 }
 
 
@@ -661,7 +664,7 @@ void ResourcePixmap::draw_subttl_resource(TrackCanvas *canvas, Edit *edit, int x
 {
 	SEdit *sedit = (SEdit *)edit;
 	char *text = sedit->get_text();
-	if( !*text || w < 10 ) return;
+	if( !*text || w < xS(10) ) return;
 	int center_pixel = canvas->resource_h() / 2;
 	if( edit->track->show_titles() )
 		center_pixel += mwindow->theme->get_image("title_bg_data")->get_h();
@@ -675,7 +678,7 @@ void ResourcePixmap::draw_subttl_resource(TrackCanvas *canvas, Edit *edit, int x
 	canvas->set_color(color);
 	int ch = canvas->get_text_height(font);
 	int hh = canvas->get_text_height(font,text) + ch/2;
-	int y1 = y_max - hh - 10;
+	int y1 = y_max - hh - yS(10);
 	if( y1 < 0 ) y1 = 0;
 	canvas->draw_text(x1, y1, text, -1, this);
 }