X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmainsession.C;h=66978fef4c32c355044270f6c66921d24cc8b0f0;hb=2fba7eab40198b35d9edb20c16bcc1b8c262f7a2;hp=e0a8a8265f57752e73b347788500a9f8b4a3b116;hpb=6ff8b339d215bb1c2cef589fd7959aa2e1834105;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mainsession.C b/cinelerra-5.1/cinelerra/mainsession.C
index e0a8a826..66978fef 100644
--- a/cinelerra-5.1/cinelerra/mainsession.C
+++ b/cinelerra-5.1/cinelerra/mainsession.C
@@ -106,6 +106,9 @@ MainSession::MainSession(MWindow *mwindow)
 	use_vector = 0;
 	use_hist_parade = 0;
 	use_wave_parade = 0;
+	use_wave_gain = 5;
+	use_vect_gain = 5;
+	use_smooth = 0;
 	afolders_w = 0;
 	show_vwindow = show_awindow = show_cwindow = show_gwindow = show_lwindow = 0;
 	plugindialog_w = plugindialog_h = 0;
@@ -243,16 +246,20 @@ void MainSession::default_window_positions(int window_config)
 		case 1024: right_w = 1280;  break;
 		case 1200: right_w = 1600;  break;
 		case 1080: right_w = 1920;  break;
-		default:   right_w = root_w/2;  break;
+		default:
+			dual_head = 0;
+			break;
 		}
-		if( window_config == 1 ) {
-			root_x = root_w - right_w;
-			root_w = right_w;
-		}
-		else {
-			// use same aspect ratio to compute left height
-			root_w -= right_w;
-			root_h = (root_w*root_h) / right_w;
+		if( dual_head ) {
+			if( window_config == 1 ) {
+				root_x = root_w - right_w;
+				root_w = right_w;
+			}
+			else {
+				// use same aspect ratio to compute left height
+				root_w -= right_w;
+				root_h = (root_w*root_h) / right_w;
+			}
 		}
 	}
 
@@ -317,6 +324,9 @@ void MainSession::default_window_positions(int window_config)
 	use_vector = 1;
 	use_hist_parade = 1;
 	use_wave_parade = 1;
+	use_wave_gain = 5;
+	use_vect_gain = 5;
+	use_smooth = 1;
 
 	if(mwindow->edl)
 		lwindow_w = MeterPanel::get_meters_width(mwindow->theme,
@@ -368,8 +378,12 @@ void MainSession::default_window_positions(int window_config)
 int MainSession::load_defaults(BC_Hash *defaults)
 {
 // Setup main windows
-	strcpy(a_x11_host, defaults->get("A_X11_HOST", a_x11_host));
-	strcpy(b_x11_host, defaults->get("B_X11_HOST", b_x11_host));
+	char *a_host = defaults->get("A_X11_HOST", a_x11_host);
+	if( a_host != a_x11_host )
+		strcpy(a_x11_host, defaults->get("A_X11_HOST", a_x11_host));
+	char *b_host = defaults->get("B_X11_HOST", b_x11_host);
+	if( b_host != b_x11_host )
+		strcpy(b_x11_host, defaults->get("B_X11_HOST", b_x11_host));
 	window_config = defaults->get("WINDOW_CONFIG", window_config);
 	default_window_positions(window_config);
 
@@ -427,6 +441,9 @@ int MainSession::load_defaults(BC_Hash *defaults)
 	use_vector = defaults->get("USE_VECTOR", use_vector);
 	use_hist_parade = defaults->get("USE_HIST_PARADE", use_hist_parade);
 	use_wave_parade = defaults->get("USE_WAVE_PARADE", use_wave_parade);
+	use_wave_gain = defaults->get("USE_WAVE_GAIN", use_wave_gain);
+	use_vect_gain = defaults->get("USE_VECT_GAIN", use_vect_gain);
+	use_smooth = defaults->get("USE_SMOOTH", use_smooth);
 
 //printf("MainSession::load_defaults 1\n");
 
@@ -552,6 +569,9 @@ int MainSession::save_defaults(BC_Hash *defaults)
 	defaults->update("USE_VECTOR", use_vector);
 	defaults->update("USE_HIST_PARADE", use_hist_parade);
 	defaults->update("USE_WAVE_PARADE", use_wave_parade);
+	defaults->update("USE_WAVE_GAIN", use_wave_gain);
+	defaults->update("USE_VECT_GAIN", use_vect_gain);
+	defaults->update("USE_SMOOTH", use_smooth);
 
  	defaults->update("ABINS_W", afolders_w);