X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fcanvas.h;h=8c913855b2060ed53d5a3e8fb3356a3357979dea;hb=37600b4b217caa5e316984ec0b035c5e8f9698af;hp=972b6cfa1ef9745c1d60c6cacdcd3c765e5d5158;hpb=493ba873017ae66e23031e3caf949466960dc971;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/canvas.h b/synfig-core/trunk/src/synfig/canvas.h
index 972b6cf..8c91385 100644
--- a/synfig-core/trunk/src/synfig/canvas.h
+++ b/synfig-core/trunk/src/synfig/canvas.h
@@ -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
@@ -69,7 +70,7 @@ public:
 
 	typedef std::list<Handle> Children;
 
-	friend void synfig::optimize_layers(Context, Canvas::Handle);
+	friend void synfig::optimize_layers(Context, Canvas::Handle, bool seen_motion_blur);
 
 	/*
  --	** -- D A T A -------------------------------------------------------------
@@ -143,7 +144,7 @@ private:
 	std::map<String,std::set<etl::handle<Layer> > > group_db_;
 
 	//! Layer Connection database
-	std::map<etl::handle<Layer>,std::vector<sigc::connection> > connections_;
+	std::map<etl::loose_handle<Layer>,std::vector<sigc::connection> > connections_;
 
 	/*
  -- ** -- S I G N A L S -------------------------------------------------------
@@ -473,15 +474,15 @@ public:
 private:
 	void add_group_pair(String group, etl::handle<Layer> layer);
 	void remove_group_pair(String group, etl::handle<Layer> layer);
-	void add_connection(etl::handle<Layer> layer, sigc::connection connection);
-	void disconnect_connections(etl::handle<Layer> layer);
+	void add_connection(etl::loose_handle<Layer> layer, sigc::connection connection);
+	void disconnect_connections(etl::loose_handle<Layer> layer);
 
 protected:
 	virtual void on_changed();
 	virtual void get_times_vfunc(Node::time_set &set) const;
 }; // END of class Canvas
 
-void optimize_layers(Context context, Canvas::Handle op_canvas);
+void optimize_layers(Context context, Canvas::Handle op_canvas, bool seen_motion_blur=false);
 
 
 }; // END of namespace synfig