X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fmain.cpp;fp=src%2Fmain.cpp;h=2612afca1acad968bf0db867a79136e1a428cf85;hp=46946f9e9bcd1279f94e6fad26f986365aa0e3a8;hb=6dd539966821debd18e0b86ed126742cd81d7fc9;hpb=63b52d964e75f9224645c6fbb4ba4387ada506f8

diff --git a/src/main.cpp b/src/main.cpp
index 46946f9..2612afc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,10 @@
 #include "main.h"
 #include <unistd.h> // Because we can.
 
+#include "controlpanel.h"
+
+
+
 int main(int argc, char ** argv)
 {	
 	#ifndef __STDC_IEC_559__
@@ -88,10 +92,34 @@ int main(int argc, char ** argv)
 	}
 	Debug("Start!");
 	Rect bounds(b[0],b[1],b[2],b[3]);
+	
+	Screen scr;
+	View view(doc,scr, bounds);
+
+	#ifndef CONTROLPANEL_DISABLED
+		ControlPanel::RunArgs args = {argc, argv, view, doc, scr};
+		SDL_Thread * cp_thread = SDL_CreateThread(ControlPanel::Run, "ControlPanel", &args);
+		if (cp_thread == NULL)
+		{
+			Error("Couldn't create ControlPanel thread: %s", SDL_GetError());
+		}
+	#endif //CONTROLPANEL_DISABLED
 
 	if (mode == LOOP)
-		MainLoop(doc, bounds, c);
-	else if (mode == OUTPUT_TO_BMP)
+		MainLoop(doc, scr, view);
+	else if (mode == OUTPUT_TO_BMP) //TODO: Remove this shit
 		OverlayBMP(doc, input_bmp, output_bmp, bounds, c);
+		
+	#ifndef CONTROLPANEL_DISABLED
+		
+		if (cp_thread != NULL)
+		{
+			int cp_return;
+			qApp->quit(); // will close the control panel
+			// (seems to not explode if the qApp has already been quit)
+			SDL_WaitThread(cp_thread, &cp_return);
+			Debug("ControlPanel thread returned %d", cp_return);
+		}
+	#endif //CONTROLPANEL_DISABLED
 	return 0;
 }