X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmainsession.C;h=bd19562d367b16fd9882322fdedfa8b6c5cade39;hp=86e5b36d3f92c4c579bbbb973347191f85a6dc2d;hb=b4184445f396e16260ed90e645a280149aeda8c0;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1

diff --git a/cinelerra-5.1/cinelerra/mainsession.C b/cinelerra-5.1/cinelerra/mainsession.C
index 86e5b36d..bd19562d 100644
--- a/cinelerra-5.1/cinelerra/mainsession.C
+++ b/cinelerra-5.1/cinelerra/mainsession.C
@@ -56,18 +56,23 @@ MainSession::MainSession(MWindow *mwindow)
 	drag_clips = new ArrayList<EDL*>;
 	drag_edits = new ArrayList<Edit*>;
 	drag_edit = 0;
+	drag_group = 0;
+	drag_group_edit = 0;
+	drag_group_position = 0;
+	drag_group_first_track = 0;
+	group_number = 1;
 	clip_number = 1;
 	brender_end = 0;
 	cwindow_controls = 1;
 	trim_edits = 0;
 	current_tip = -1;
-	drag_handle = 0;
 	cwindow_fullscreen = 0;
 	rwindow_fullscreen = 0;
 	vwindow_fullscreen = 0;
 	zwindow_fullscreen = 0;
 	selected_zwindow = -1;
 	actual_frame_rate = 0;
+	title_bar_alpha = 0;
 	window_config = 0;
 	a_x11_host[0] = 0;
 	b_x11_host[0] = 0;
@@ -124,6 +129,8 @@ MainSession::~MainSession()
 	delete drag_auto_gang;
 	delete drag_clips;
 	delete drag_edits;
+	if( drag_group )
+		drag_group->remove_user();
 }
 
 void MainSession::boundaries()
@@ -450,6 +457,7 @@ int MainSession::load_defaults(BC_Hash *defaults)
 
 	current_tip = defaults->get("CURRENT_TIP", current_tip);
 	actual_frame_rate = defaults->get("ACTUAL_FRAME_RATE", (float)-1);
+	title_bar_alpha = defaults->get("TITLE_BAR_ALPHA", (float)1);
 
 	boundaries();
 	return 0;
@@ -569,6 +577,7 @@ int MainSession::save_defaults(BC_Hash *defaults)
 	defaults->update("TRANSITIONDIALOG_H", transitiondialog_h);
 
 	defaults->update("ACTUAL_FRAME_RATE", actual_frame_rate);
+	defaults->update("TITLE_BAR_ALPHA", title_bar_alpha);
 	defaults->update("CURRENT_TIP", current_tip);
 
 
@@ -603,3 +612,31 @@ void MainSession::update_clip_number()
 	clip_number = clip_no+1;
 }
 
+int MainSession::load_file(const char *path)
+{
+	int ret = 1;
+	FILE *fp = fopen(path,"r");
+	if( fp ) {
+		BC_Hash defaults;
+		defaults.load_file(fp);
+		load_defaults(&defaults);
+		fclose(fp);
+		ret = 0;
+	}
+	return ret;
+}
+
+int MainSession::save_file(const char *path)
+{
+	int ret = 1;
+	FILE *fp = fopen(path,"w");
+	if( fp ) {
+		BC_Hash defaults;
+		save_defaults(&defaults);
+		defaults.save_file(fp);
+		fclose(fp);
+		ret = 0;
+	}
+	return ret;
+}
+