X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmain.C;h=0def64b724aab1bc01c416d0bafc0aad3a04b3a9;hb=83b70dd60863377cb281e6be5206304e10373e30;hp=6f4ee2e122cbaea6d1b3c83745bb2d4721a3ecc4;hpb=94fc059e6ed3f77f20531338cbb03bdb3b4d9eab;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/main.C b/cinelerra-5.1/cinelerra/main.C
index 6f4ee2e1..0def64b7 100644
--- a/cinelerra-5.1/cinelerra/main.C
+++ b/cinelerra-5.1/cinelerra/main.C
@@ -22,6 +22,7 @@
 #include "arraylist.h"
 #include "batchrender.h"
 #include "bcsignals.h"
+#include "cstrdup.h"
 #include "edl.h"
 #include "file.h"
 #include "filexml.h"
@@ -46,7 +47,24 @@
 #include <sys/resource.h>
 
 #ifdef LEAKER
-#define STRC(v) printf("==new %p from %p sz %jd\n", v, __builtin_return_address(0), n)
+#if 0  // track allocators
+#include <execinfo.h>
+#define BT_BUF_SIZE 100
+static void leaker()
+{
+	void *buffer[BT_BUF_SIZE];
+	int nptrs = backtrace(buffer, BT_BUF_SIZE);
+	char **trace = backtrace_symbols(buffer, nptrs);
+	if( !trace ) return;
+	for( int i=0; i<nptrs; ) printf("%s ", trace[i++]);
+	printf("\n");
+        free(trace);
+}
+#define STRB ;leaker()
+#else
+#define STRB
+#endif
+#define STRC(v) printf("==new %p from %p sz %jd\n", v, __builtin_return_address(0), n)STRB
 #define STRD(v) printf("==del %p from %p\n", v, __builtin_return_address(0))
 void *operator new(size_t n) { void *vp = malloc(n); STRC(vp); bzero(vp,n); return vp; }
 void operator delete(void *t) { STRD(t); free(t); }
@@ -89,7 +107,8 @@ public:
 //PRINT_TRACE
 		mwindow->gui->lock_window("main");
 //PRINT_TRACE
-		mwindow->load_filenames(filenames, LOADMODE_REPLACE);
+		mwindow->load_filenames(filenames,
+			LOADMODE_REPLACE, LOADMODE_EDL_CLIP);
 //PRINT_TRACE
 		if( filenames->size() == 1 )
 			mwindow->gui->mainmenu->add_load(filenames->get(0));
@@ -104,11 +123,31 @@ public:
 
 long cin_timezone;
 
+static float get_layout_scale()
+{
+	char config_path[BCTEXTLEN];
+	sprintf(config_path,"%s/%s", File::get_config_path(), CONFIG_FILE);
+	FILE *fp = fopen(config_path,"r");
+	if( !fp ) return 0;
+	float scale = 0;
+	char line[BCTEXTLEN];
+	line[BCTEXTLEN-1] = 0;
+	while( fgets(line, BCTEXTLEN-1, fp) ) {
+		if( !strncmp(line, "LAYOUT_SCALE ",12+1) ) {
+			scale = atof(line+12);
+			break;
+		}
+	}
+	fclose(fp);
+	return scale;
+}
+
 int main(int argc, char *argv[])
 {
 // handle command line arguments first
 	srand(time(0));
 	ArrayList<char*> filenames;
+	filenames.set_array_delete();
 	FileSystem fs;
 
 	time_t st; time(&st);
@@ -129,7 +168,8 @@ int main(int argc, char *argv[])
 	batch_path[0] = 0;
 	deamon_path[0] = 0;
 	Units::init();
-
+	const char *lang = getenv("LANGUAGE");
+	if( lang ) lang = cstrdup(lang);
 	File::init_cin_path();
 	const char *locale_path = File::get_locale_path();
 	const char *cin = File::get_cin();
@@ -241,7 +281,10 @@ int main(int argc, char *argv[])
 		}
 	}
 
-
+	float scale = operation == DO_GUI ?
+		get_layout_scale() : 1;
+	// runs XInitThreads
+	BC_WindowBase::init_resources(scale);
 
 	if( operation == DO_GUI ||
 	    operation == DO_DEAMON || operation == DO_DEAMON_FG ||
@@ -322,7 +365,7 @@ int main(int argc, char *argv[])
 				MWindow mwindow;
 				mwindow.create_objects(1, !filenames.total, config_path);
 				CommandLineThread *thread  = 0;
-				if( mwindow.preferences->perpetual_session && load_perpetual )
+				if( load_perpetual )
 					mwindow.load_undo_data();
 //SET_TRACE
 // load the initial files on seperate tracks
@@ -356,16 +399,18 @@ int main(int argc, char *argv[])
 				}
 				if( restart <= 0 )
 					done = 1;
-
 				mwindow.save_defaults();
-				if( mwindow.preferences->perpetual_session )
-					mwindow.save_undo_data();
+				mwindow.save_undo_data();
 //PRINT_TRACE
 				filenames.remove_all_objects();
 				delete thread;
 			}
 
 			if( restart < 0 ) {
+				if( lang ) // reset to cmdline state
+					setenv("LANGUAGE", lang, 1);
+				else
+					unsetenv("LANGUAGE");
 				char exe_path[BCTEXTLEN];
 				int len = readlink("/proc/self/exe", exe_path, sizeof(exe_path)-1);
 				if( len < 0 ) break;
@@ -383,7 +428,9 @@ DISABLE_BUFFER
 	}
 
 	filenames.remove_all_objects();
+	delete [] lang;
 	Units::finit();
+	BC_WindowBase::finit_resources();
 
 	time_t et; time(&et);
 	long dt = et - st;