X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fasyncrenderer.cpp;h=d68f7622099135a098595e45488a20b75f7a8b9c;hb=3fe8b02daa1dff7dd1d00dc6e85b70c96103d185;hp=9c41444bda5ab7c940e7e3905862fb5122a36a66;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/asyncrenderer.cpp b/synfig-studio/trunk/src/gtkmm/asyncrenderer.cpp index 9c41444..d68f762 100644 --- a/synfig-studio/trunk/src/gtkmm/asyncrenderer.cpp +++ b/synfig-studio/trunk/src/gtkmm/asyncrenderer.cpp @@ -1,20 +1,21 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file asyncrenderer.cpp ** \brief Template File ** -** $Id: asyncrenderer.cpp,v 1.5 2005/01/12 07:03:42 darco Exp $ +** $Id$ ** ** \legal -** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley ** -** This software and associated documentation -** are CONFIDENTIAL and PROPRIETARY property of -** the above-mentioned copyright holder. +** This package is free software; you can redistribute it and/or +** modify it under the terms of the GNU General Public License as +** published by the Free Software Foundation; either version 2 of +** the License, or (at your option) any later version. ** -** You may not copy, print, publish, or in any -** other way distribute this software without -** a prior written agreement with -** the copyright holder. +** This package is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. ** \endlegal */ /* ========================================================================= */ @@ -29,6 +30,7 @@ #endif #include "asyncrenderer.h" +#include "app.h" #include #include @@ -48,7 +50,7 @@ #include #endif -#include +#include #include #endif @@ -57,7 +59,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; #define BOREDOM_TIMEOUT 50 @@ -70,11 +72,11 @@ using namespace studio; /* === C L A S S E S ======================================================= */ -class AsyncTarget_Tile : public sinfg::Target_Tile +class AsyncTarget_Tile : public synfig::Target_Tile { public: - etl::handle warm_target; - + etl::handle warm_target; + struct tile_t { Surface surface; @@ -87,17 +89,17 @@ public: }; std::list tile_queue; Glib::Mutex mutex; - + #ifndef GLIB_DISPATCHER_BROKEN Glib::Dispatcher tile_ready_signal; #endif Glib::Cond cond_tile_queue_empty; bool alive_flag; - + sigc::connection ready_connection; - + public: - AsyncTarget_Tile(etl::handle warm_target): + AsyncTarget_Tile(etl::handle warm_target): warm_target(warm_target) { set_avoid_time_sync(warm_target->get_avoid_time_sync()); @@ -114,7 +116,7 @@ public: ready_connection=tile_ready_signal.connect(sigc::mem_fun(*this,&AsyncTarget_Tile::tile_ready)); #endif } - + ~AsyncTarget_Tile() { ready_connection.disconnect(); @@ -124,17 +126,17 @@ public: Glib::Mutex::Lock lock(mutex); alive_flag=false; } - + virtual int total_tiles()const { return warm_target->total_tiles(); } - + virtual int next_tile(int& x, int& y) { if(!alive_flag) return 0; - + return warm_target->next_tile(x,y); } @@ -144,15 +146,15 @@ public: return 0; return warm_target->next_frame(time); } - - virtual bool start_frame(sinfg::ProgressCallback *cb=0) + + virtual bool start_frame(synfig::ProgressCallback *cb=0) { if(!alive_flag) return false; return warm_target->start_frame(cb); } - - virtual bool add_tile(const sinfg::Surface &surface, int gx, int gy) + + virtual bool add_tile(const synfig::Surface &surface, int gx, int gy) { assert(surface); if(!alive_flag) @@ -173,7 +175,7 @@ public: tile_ready_signal(); #endif } - + return alive_flag; } @@ -189,9 +191,9 @@ public: while(!tile_queue.empty() && alive_flag) { tile_t& tile(tile_queue.front()); - + alive_flag=warm_target->add_tile(tile.surface,tile.x,tile.y); - + tile_queue.pop_front(); } cond_tile_queue_empty.signal(); @@ -199,16 +201,19 @@ public: virtual void end_frame() { - while(alive_flag) + if (!single_threaded()) { - Glib::Mutex::Lock lock(mutex); - if(!tile_queue.empty() && alive_flag) + while(alive_flag) { - if(cond_tile_queue_empty.timed_wait(mutex,Glib::TimeVal(0,BOREDOM_TIMEOUT))) + Glib::Mutex::Lock lock(mutex); + if(!tile_queue.empty() && alive_flag) + { + if(cond_tile_queue_empty.timed_wait(mutex,Glib::TimeVal(0,BOREDOM_TIMEOUT))) + break; + } + else break; } - else - break; } Glib::Mutex::Lock lock(mutex); if(!alive_flag) @@ -219,16 +224,16 @@ public: -class AsyncTarget_Scanline : public sinfg::Target_Scanline +class AsyncTarget_Scanline : public synfig::Target_Scanline { public: - etl::handle warm_target; - + etl::handle warm_target; + int scanline_; Surface surface; Glib::Mutex mutex; - + #ifndef GLIB_DISPATCHER_BROKEN Glib::Dispatcher frame_ready_signal; #endif @@ -239,7 +244,7 @@ public: public: - AsyncTarget_Scanline(etl::handle warm_target): + AsyncTarget_Scanline(etl::handle warm_target): warm_target(warm_target) { set_avoid_time_sync(warm_target->get_avoid_time_sync()); @@ -254,7 +259,7 @@ public: #endif surface.set_wh(warm_target->rend_desc().get_w(),warm_target->rend_desc().get_h()); } - + ~AsyncTarget_Scanline() { ready_connection.disconnect(); @@ -273,12 +278,12 @@ public: Glib::Mutex::Lock lock(mutex); alive_flag=false; } - - virtual bool start_frame(sinfg::ProgressCallback *cb=0) - { + + virtual bool start_frame(synfig::ProgressCallback */*cb*/=0) + { return alive_flag; } - + virtual void end_frame() { { @@ -299,24 +304,27 @@ public: #else frame_ready_signal(); #endif - } - - while(alive_flag && !ready_next) - { - Glib::Mutex::Lock lock(mutex); - if(cond_frame_queue_empty.timed_wait(mutex,Glib::TimeVal(0,BOREDOM_TIMEOUT))) - break; } + + if (single_threaded()) + signal_progress()(); + else + while(alive_flag && !ready_next) + { + Glib::Mutex::Lock lock(mutex); + if(cond_frame_queue_empty.timed_wait(mutex,Glib::TimeVal(0,BOREDOM_TIMEOUT))) + break; + } } - + virtual Color * start_scanline(int scanline) { Glib::Mutex::Lock lock(mutex); return surface[scanline]; } - + virtual bool end_scanline() { return alive_flag; @@ -327,7 +335,7 @@ public: Glib::Mutex::Lock lock(mutex); if(alive_flag) alive_flag=warm_target->add_frame(&surface); - cond_frame_queue_empty.signal(); + if (!single_threaded()) cond_frame_queue_empty.signal(); ready_next=true; } }; @@ -338,32 +346,33 @@ public: /* === M E T H O D S ======================================================= */ -AsyncRenderer::AsyncRenderer(etl::handle target_,sinfg::ProgressCallback *cb): +AsyncRenderer::AsyncRenderer(etl::handle target_,synfig::ProgressCallback *cb): error(false), success(false), - cb(cb) + cb(cb), + updating(false) { render_thread=0; - if(etl::handle::cast_dynamic(target_)) + if(etl::handle::cast_dynamic(target_)) { etl::handle wrap_target( - new AsyncTarget_Tile(etl::handle::cast_dynamic(target_)) + new AsyncTarget_Tile(etl::handle::cast_dynamic(target_)) ); - + signal_stop_.connect(sigc::mem_fun(*wrap_target,&AsyncTarget_Tile::set_dead)); - + target=wrap_target; } - else if(etl::handle::cast_dynamic(target_)) + else if(etl::handle::cast_dynamic(target_)) { etl::handle wrap_target( new AsyncTarget_Scanline( - etl::handle::cast_dynamic(target_) + etl::handle::cast_dynamic(target_) ) ); - + signal_stop_.connect(sigc::mem_fun(*wrap_target,&AsyncTarget_Scanline::set_dead)); - + target=wrap_target; } } @@ -380,23 +389,23 @@ AsyncRenderer::stop() { Glib::Mutex::Lock lock(mutex); done_connection.disconnect(); - + if(render_thread) { signal_stop_(); - + #if REJOIN_ON_STOP - render_thread->join(); + if (!single_threaded()) render_thread->join(); #endif - + // Make sure all the dispatch crap is cleared out //Glib::MainContext::get_default()->iteration(false); - + if(success) signal_success_(); - + signal_finished_(); - + target=0; render_thread=0; } @@ -426,6 +435,14 @@ AsyncRenderer::start() } void +AsyncRenderer::rendering_progress() +{ + updating = true; + while(studio::App::events_pending()) studio::App::iteration(false); + updating = false; +} + +void AsyncRenderer::start_() { error=false;success=false; @@ -434,16 +451,26 @@ AsyncRenderer::start_() #ifndef GLIB_DISPATCHER_BROKEN done_connection=signal_done_.connect(mem_fun(*this,&AsyncRenderer::stop)); #endif - - render_thread=Glib::Thread::create( - sigc::mem_fun(*this,&AsyncRenderer::render_target), + + if (single_threaded()) + { + synfig::info("%s:%d rendering in the same thread", __FILE__, __LINE__); + target->signal_progress().connect(sigc::mem_fun(this,&AsyncRenderer::rendering_progress)); + render_thread = (Glib::Thread*)1; + render_target(); + } + else + { + render_thread=Glib::Thread::create( + sigc::mem_fun(*this,&AsyncRenderer::render_target), #if REJOIN_ON_STOP - true + true #else - false + false #endif - ); - assert(render_thread); + ); + assert(render_thread); + } } else { @@ -455,7 +482,7 @@ void AsyncRenderer::render_target() { etl::handle target(AsyncRenderer::target); - + if(target && target->render()) { success=true;