X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Frecordmonitor.C;h=d8302adca5803122aa976ddc30eef3beb74a16ec;hb=83c58d6d78f6bf0d1d1fd4cfba8654906fe6ec29;hp=aa10ec0d26e045b69f3e9af8b5dfc2b5062054d0;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/recordmonitor.C b/cinelerra-5.1/cinelerra/recordmonitor.C
index aa10ec0d..d8302adc 100644
--- a/cinelerra-5.1/cinelerra/recordmonitor.C
+++ b/cinelerra-5.1/cinelerra/recordmonitor.C
@@ -77,8 +77,7 @@ RecordMonitor::~RecordMonitor()
 
 void RecordMonitor::create_objects()
 {
-	int min_w = 150;
-	mwindow->session->rwindow_fullscreen = 0;
+	int min_w = xS(150);
 
 	if( !record->default_asset->video_data )
 		min_w = MeterPanel::get_meters_width(mwindow->theme,
@@ -170,12 +169,12 @@ int RecordMonitor::get_canvas_height()
 int RecordMonitor::get_channel_x()
 {
 //	return 240;
-	return 5;
+	return xS(5);
 }
 
 int RecordMonitor::get_channel_y()
 {
-	return 2;
+	return yS(2);
 }
 
 void RecordMonitor::stop_playback()
@@ -237,7 +236,7 @@ RecordMonitorGUI::RecordMonitorGUI(MWindow *mwindow,
 			mwindow->session->rmonitor_y,
  			mwindow->session->rmonitor_w,
  			mwindow->session->rmonitor_h,
-			min_w, 50, 1, 1, 1, -1,
+			min_w, yS(50), 1, 1, 1, -1,
 			mwindow->get_cwindow_display())
 {
 //printf("%d %d\n", mwindow->session->rmonitor_w, mwindow->theme->rmonitor_meter_x);
@@ -326,7 +325,7 @@ void RecordMonitorGUI::create_objects()
 
 				add_subwindow(avc1394transport_timecode =
 					new BC_Title(avc1394_transport->x_end,
-						mwindow->theme->rmonitor_tx_y + 10,
+						mwindow->theme->rmonitor_tx_y + yS(10),
 						"00:00:00:00",
 						MEDIUM_7SEGMENT,
 						BLACK));
@@ -346,8 +345,8 @@ void RecordMonitorGUI::create_objects()
 			background_done = 1;
 		}
 
-		mwindow->theme->rmonitor_canvas_w = MAX(10, mwindow->theme->rmonitor_canvas_w);
-		mwindow->theme->rmonitor_canvas_h = MAX(10, mwindow->theme->rmonitor_canvas_h);
+		mwindow->theme->rmonitor_canvas_w = MAX(xS(10), mwindow->theme->rmonitor_canvas_w);
+		mwindow->theme->rmonitor_canvas_h = MAX(yS(10), mwindow->theme->rmonitor_canvas_h);
 		canvas = new RecordMonitorCanvas(mwindow, this, record,
 			mwindow->theme->rmonitor_canvas_x,
 			mwindow->theme->rmonitor_canvas_y,
@@ -359,7 +358,7 @@ void RecordMonitorGUI::create_objects()
 #ifdef HAVE_DVB
 		if( driver == CAPTURE_DVB ) {
 			int ssw = SignalStatus::calculate_w(this);
-			signal_status = new SignalStatus(this, get_w()-ssw-3, 0);
+			signal_status = new SignalStatus(this, get_w()-ssw-xS(3), 0);
 			add_subwindow(signal_status);
 			signal_status->create_objects();
 		}
@@ -424,7 +423,7 @@ void RecordMonitorGUI::create_objects()
 
 int RecordMonitorGUI::button_press_event()
 {
-	if(mwindow->session->rwindow_fullscreen && canvas && canvas->get_canvas())
+	if( canvas && canvas->get_fullscreen() && canvas->get_canvas())
 		return canvas->button_press_event_base(canvas->get_canvas());
 
 	if( get_buttonpress() == 2 ) {
@@ -819,16 +818,6 @@ void RecordMonitorCanvas::zoom_resize_window(float percentage)
 	window->resize_event(new_w, new_h);
 }
 
-int RecordMonitorCanvas::get_fullscreen()
-{
-	return mwindow->session->rwindow_fullscreen;
-}
-
-void RecordMonitorCanvas::set_fullscreen(int value)
-{
-	mwindow->session->rwindow_fullscreen = value;
-}
-
 
 int RecordMonitorCanvas::button_release_event()
 {