X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fasyncrenderer.cpp;h=72a286c92a56c1dfb5d7009284288a61d6de07d9;hb=7e1b3e8ecf46144d377f338b075967baa4b08ba6;hp=772e6f94d14fa21d6c1f28fedf19853d29018ce9;hpb=d41bb9b7d5f46a07d2b2077dd705738b40cd5bed;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/asyncrenderer.cpp b/synfig-studio/trunk/src/gtkmm/asyncrenderer.cpp
index 772e6f9..72a286c 100644
--- a/synfig-studio/trunk/src/gtkmm/asyncrenderer.cpp
+++ b/synfig-studio/trunk/src/gtkmm/asyncrenderer.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -210,8 +211,10 @@ public:
 
 	virtual void end_frame()
 	{
+#ifdef SINGLE_THREADED
 		if (!single_threaded())
 		{
+#endif
 			while(alive_flag)
 			{
 				Glib::Mutex::Lock lock(mutex);
@@ -223,7 +226,9 @@ public:
 				else
 					break;
 			}
+#ifdef SINGLE_THREADED
 		}
+#endif
 		Glib::Mutex::Lock lock(mutex);
 		if(!alive_flag)
 			return;
@@ -315,9 +320,11 @@ public:
 #endif
 		}
 
+#ifdef SINGLE_THREADED
 		if (single_threaded())
 			signal_progress()();
 		else
+#endif
 			while(alive_flag && !ready_next)
 			{
 				Glib::Mutex::Lock lock(mutex);
@@ -344,7 +351,10 @@ public:
 		Glib::Mutex::Lock lock(mutex);
 		if(alive_flag)
 			alive_flag=warm_target->add_frame(&surface);
-		if (!single_threaded()) cond_frame_queue_empty.signal();
+#ifdef SINGLE_THREADED
+		if (!single_threaded())
+#endif
+			cond_frame_queue_empty.signal();
 		ready_next=true;
 	}
 };
@@ -358,8 +368,10 @@ public:
 AsyncRenderer::AsyncRenderer(etl::handle<synfig::Target> target_,synfig::ProgressCallback *cb):
 	error(false),
 	success(false),
-	cb(cb),
-	updating(false)
+	cb(cb)
+#ifdef SINGLE_THREADED
+	, updating(false)
+#endif
 {
 	render_thread=0;
 	if(etl::handle<synfig::Target_Tile>::cast_dynamic(target_))
@@ -404,7 +416,10 @@ AsyncRenderer::stop()
 			signal_stop_();
 
 #if REJOIN_ON_STOP
-			if (!single_threaded()) render_thread->join();
+#ifdef SINGLE_THREADED
+			if (!single_threaded())
+#endif
+				render_thread->join();
 #endif
 
 			// Make sure all the dispatch crap is cleared out
@@ -443,6 +458,7 @@ AsyncRenderer::start()
 	);
 }
 
+#ifdef SINGLE_THREADED
 void
 AsyncRenderer::rendering_progress()
 {
@@ -450,6 +466,7 @@ AsyncRenderer::rendering_progress()
 	while(studio::App::events_pending()) studio::App::iteration(false);
 	updating = false;
 }
+#endif
 
 void
 AsyncRenderer::start_()
@@ -461,6 +478,7 @@ AsyncRenderer::start_()
 		done_connection=signal_done_.connect(mem_fun(*this,&AsyncRenderer::stop));
 #endif
 
+#ifdef SINGLE_THREADED
 		if (single_threaded())
 		{
 			synfig::info("%s:%d rendering in the same thread", __FILE__, __LINE__);
@@ -469,6 +487,7 @@ AsyncRenderer::start_()
 			render_target();
 		}
 		else
+#endif
 		{
 			render_thread=Glib::Thread::create(
 				sigc::mem_fun(*this,&AsyncRenderer::render_target),