From c7c27203ae2b8add41ad5090195ac4ad6fd67c6f Mon Sep 17 00:00:00 2001
From: terminatorX <>
Date: Thu, 12 Jun 2003 01:44:52 +0000
Subject: [PATCH] Fixing sample file dialog initialization and other things -
 Alex

---
 src/tX_global.c        |  5 ++++-
 src/tX_global.h        |  2 +-
 src/tX_legacy_global.c |  2 +-
 src/tX_seqpar.cc       |  1 +
 src/tX_vtt.cc          |  6 ++++++
 src/tX_vttgui.cc       | 17 ++++-------------
 6 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/tX_global.c b/src/tX_global.c
index 9f0c71c..1434f27 100644
--- a/src/tX_global.c
+++ b/src/tX_global.c
@@ -125,7 +125,7 @@ void set_global_defaults() {
 #endif	
 #endif		
 	globals.use_stdout_cmdline=0;
-	globals.current_path = NULL;
+	strcpy(globals.current_path, "");
 	globals.pitch=1.0;
 	globals.volume=1.0;
 	
@@ -213,6 +213,7 @@ int load_globals_xml() {
 			restore_string("record_filename", globals.record_filename);
 			restore_string("file_editor", globals.file_editor);
 			restore_string("lrdf_path", globals.lrdf_path);
+			restore_string("last_path", globals.current_path);
 			
 			restore_int("compress_set_files", globals.compress_set_files);
 			restore_int("fullscreen_enabled", globals.fullscreen_enabled);
@@ -308,6 +309,8 @@ void store_globals() {
 		store_int("confirm_events", globals.confirm_events);
 		store_float("vtt_inertia", globals.vtt_inertia);
 
+		store_string("last_path", globals.current_path);
+
 		fprintf(rc,"</terminatorXrc>\n");
 	}
 }
diff --git a/src/tX_global.h b/src/tX_global.h
index 788d261..d3b9e9e 100644
--- a/src/tX_global.h
+++ b/src/tX_global.h
@@ -111,7 +111,7 @@ typedef struct {
 	int true_block_size;
 	int update_delay; 
 	
-	char *current_path;
+	char current_path[PATH_MAX];
 	
 	/* new audiodevice handling 
 	   we have *all* variables for *all* audiodevice types -
diff --git a/src/tX_legacy_global.c b/src/tX_legacy_global.c
index 0ccf205..5f97b4a 100644
--- a/src/tX_legacy_global.c
+++ b/src/tX_legacy_global.c
@@ -63,7 +63,7 @@ void load_globals_old() {
 	  to old values on startup....
 	*/
 	globals.use_stdout_cmdline=0;
-	globals.current_path = NULL;
+	globals.current_path[0] = 0;
 	globals.pitch=1.0;
 	globals.volume=1.0;	
 }
diff --git a/src/tX_seqpar.cc b/src/tX_seqpar.cc
index f58840e..09ac06c 100644
--- a/src/tX_seqpar.cc
+++ b/src/tX_seqpar.cc
@@ -885,6 +885,7 @@ void tX_seqpar_vttfx_float :: create_widget()
 	float tmp=max_value - min_value/1000;
 
 	*fx_value=min_value;
+	//myadj=GTK_ADJUSTMENT(gtk_adjustment_new(*fx_value, min_value+tmp/10, max_value-tmp/10, tmp, tmp, tmp));
 	myadj=GTK_ADJUSTMENT(gtk_adjustment_new(*fx_value, min_value, max_value, tmp, tmp, tmp));
 	mydial=new tX_extdial(label_name, myadj);
 	gtk_signal_connect(GTK_OBJECT(myadj), "value_changed", (GtkSignalFunc) tX_seqpar_vttfx_float :: gtk_callback, this);
diff --git a/src/tX_vtt.cc b/src/tX_vtt.cc
index b2fea64..cfd788e 100644
--- a/src/tX_vtt.cc
+++ b/src/tX_vtt.cc
@@ -215,6 +215,8 @@ vtt_class :: ~vtt_class()
 	if (output_buffer) tX_freemem(output_buffer, "output_buffer", "vtt Destructor");
 	vtt_amount--;
 	
+	if (mix_solo) solo_ctr--;
+	
 	while (fx_list.size())
 	{ 
 		effect=(*fx_list.begin());
@@ -1521,6 +1523,10 @@ int vtt_class :: load(xmlDocPtr doc, xmlNodePtr node) {
 
 	recalc_volume();
 
+	if (mix_solo) {
+		solo_ctr++;
+	}
+	
 	if (xpar_id>=0) {
 		set_x_input_parameter(tX_seqpar :: get_sp_by_persistence_id(xpar_id));
 	}
diff --git a/src/tX_vttgui.cc b/src/tX_vttgui.cc
index 2318006..9c7e9a8 100644
--- a/src/tX_vttgui.cc
+++ b/src/tX_vttgui.cc
@@ -223,13 +223,7 @@ void do_load_file(GtkWidget *wid, vtt_class *vtt)
 	
 	load_part(newfile, vtt);
 	
-	if (!globals.current_path)
-	{
-		free(globals.current_path);
-		globals.current_path = NULL;
-	}
-
-	globals.current_path = strdup(newfile);
+	strcpy(globals.current_path, newfile);
 
 	vtt->gui.file_dialog=NULL;
 	
@@ -281,19 +275,16 @@ GtkSignalFunc load_file(GtkWidget *wid, vtt_class *vtt)
 	sprintf(buffer, "Select Audio File for %s", vtt->name);
 	vtt->gui.fs=gtk_file_selection_new(buffer);
 	
-	if (strlen(vtt->filename) > 0)
-	{
+	if (vtt->audiofile) {
 		gtk_file_selection_set_filename(GTK_FILE_SELECTION(vtt->gui.fs), vtt->filename);	
+	} else if (strlen(globals.current_path)>0 ) {
+		gtk_file_selection_set_filename(GTK_FILE_SELECTION(vtt->gui.fs),globals.current_path);
 	}
 	
 	gtk_widget_show(GTK_WIDGET(vtt->gui.fs));
 	
 	vtt->gui.file_dialog=vtt->gui.fs->window;
 	
-	if (globals.current_path)
-		{
-			gtk_file_selection_set_filename(GTK_FILE_SELECTION(vtt->gui.fs),globals.current_path);
-		}
 	gtk_signal_connect (GTK_OBJECT(GTK_FILE_SELECTION(vtt->gui.fs)->ok_button), "clicked", GTK_SIGNAL_FUNC(do_load_file), vtt);
 	gtk_signal_connect (GTK_OBJECT(GTK_FILE_SELECTION(vtt->gui.fs)->cancel_button), "clicked", GTK_SIGNAL_FUNC (cancel_load_file), vtt);	
 	gtk_signal_connect (GTK_OBJECT(vtt->gui.fs), "delete-event", GTK_SIGNAL_FUNC(quit_load_file), vtt);	
-- 
2.30.2