Minor security fix: mod_dv used popen to run the DV encoder, change it to use pipe...

[synfig.git] / synfig-core / trunk / src / synfig / canvas.h

diff --git a/synfig-core/trunk/src/synfig/canvas.h b/synfig-core/trunk/src/synfig/canvas.h
index 972b6cf..af168f9 100644 (file)
--- 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 -------------------------------------------------------
@@ -188,6 +189,8 @@ private:
        //!     ValueBasenode Changed
        sigc::signal<void, etl::handle<ValueNode> > signal_value_node_changed_;
 
+       sigc::signal<void, etl::handle<ValueNode> > signal_value_node_renamed_;
+
        sigc::signal<void, etl::handle<ValueNode>, etl::handle<ValueNode> > signal_value_node_child_added_;
 
        sigc::signal<void, etl::handle<ValueNode>, etl::handle<ValueNode> > signal_value_node_child_removed_;
@@ -231,6 +234,8 @@ public:
 
        sigc::signal<void, etl::handle<ValueNode> >& signal_value_node_changed() { return signal_value_node_changed_; }
 
+       sigc::signal<void, etl::handle<ValueNode> >& signal_value_node_renamed() { return signal_value_node_renamed_; }
+
        //!     Dirty
        sigc::signal<void>& signal_dirty() { return signal_changed();   }
 
@@ -473,15 +478,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