projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove .gitignore do nothing is ignored.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
asyncrenderer.h
diff --git
a/synfig-studio/trunk/src/gtkmm/asyncrenderer.h
b/synfig-studio/trunk/src/gtkmm/asyncrenderer.h
index
6e040aa
..
6678e4e
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/asyncrenderer.h
+++ b/
synfig-studio/trunk/src/gtkmm/asyncrenderer.h
@@
-2,10
+2,11
@@
/*! \file asyncrenderer.h
** \brief Template Header
**
/*! \file asyncrenderer.h
** \brief Template Header
**
-** $Id
: asyncrenderer.h,v 1.3 2005/01/12 07:03:42 darco Exp
$
+** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \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
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-42,6
+43,12
@@
/* === M A C R O S ========================================================= */
/* === M A C R O S ========================================================= */
+// uncomment to use a single thread, and hopefully get more stability
+// #define SINGLE_THREADED
+#ifdef SINGLE_THREADED
+# define single_threaded() App::single_threaded
+#endif
+
/* === T Y P E D E F S ===================================================== */
/* === C L A S S E S & S T R U C T S ======================================= */
/* === T Y P E D E F S ===================================================== */
/* === C L A S S E S & S T R U C T S ======================================= */
@@
-54,16
+61,16
@@
class AsyncRenderer : public etl::shared_object, public sigc::trackable
sigc::signal<void> signal_success_;
std::list<sigc::connection> activity_connection_list;
sigc::signal<void> signal_success_;
std::list<sigc::connection> activity_connection_list;
-
+
//etl::handle<synfig::Target_Scanline> target_scanline;
//etl::handle<synfig::Target_Tile> target_tile;
etl::handle<synfig::Target> target;
bool error;
bool success;
//etl::handle<synfig::Target_Scanline> target_scanline;
//etl::handle<synfig::Target_Tile> target_tile;
etl::handle<synfig::Target> target;
bool error;
bool success;
-
+
synfig::ProgressCallback *cb;
synfig::ProgressCallback *cb;
-
+
sigc::signal<void> signal_stop_;
Glib::Thread* render_thread;
sigc::signal<void> signal_stop_;
Glib::Thread* render_thread;
@@
-83,6
+90,10
@@
public:
void stop();
void pause();
void resume();
void stop();
void pause();
void resume();
+#ifdef SINGLE_THREADED
+ void rendering_progress();
+ bool updating;
+#endif
bool has_error()const { return error; }
bool has_success()const { return success; }
bool has_error()const { return error; }
bool has_success()const { return success; }
@@
-100,7
+111,7
@@
private:
*/
protected:
*/
protected:
-
+
};
}; // END of namespace studio
};
}; // END of namespace studio