Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-core / trunk / src / synfig / valuenode_switch.cpp

diff --git a/synfig-core/trunk/src/synfig/valuenode_switch.cpp b/synfig-core/trunk/src/synfig/valuenode_switch.cpp
index 022e832..195bd95 100644 (file)
--- a/synfig-core/trunk/src/synfig/valuenode_switch.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_switch.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
 /*!    \file valuenode_switch.cpp
-**     \brief Template File
+**     \brief Implementation of the "Switch" valuenode conversion.
 **
 **     $Id$
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2007, 2008 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
@@ -80,35 +81,24 @@ ValueNode_Switch::~ValueNode_Switch()
 }
 
 bool
-ValueNode_Switch::set_link_vfunc(int i,ValueNode::Handle x)
+ValueNode_Switch::set_link_vfunc(int i,ValueNode::Handle value)
 {
        assert(i>=0 && i<link_count());
+
        switch(i)
        {
-       case 0:
-               if(x->get_type()!=get_type() && !PlaceholderValueNode::Handle::cast_dynamic(x))
-                       return false;
-               link_off_=x;
-               signal_child_changed()(i);signal_value_changed()();
-               return true;
-       case 1:
-               if(x->get_type()!=get_type() && !PlaceholderValueNode::Handle::cast_dynamic(x))
-                       return false;
-               link_on_=x;
-               signal_child_changed()(i);signal_value_changed()();
-               return true;
-       case 2:
-               switch_=x;
-               signal_child_changed()(i);signal_value_changed()();
-               return true;
+       case 0: CHECK_TYPE_AND_SET_VALUE(link_off_, get_type());
+       case 1: CHECK_TYPE_AND_SET_VALUE(link_on_,  get_type());
+       case 2: CHECK_TYPE_AND_SET_VALUE(switch_,   ValueBase::TYPE_BOOL);
        }
-       return true;
+       return false;
 }
 
 ValueNode::LooseHandle
 ValueNode_Switch::get_link_vfunc(int i)const
 {
        assert(i>=0 && i<link_count());
+
        switch(i)
        {
        case 0: return link_off_;
@@ -128,6 +118,7 @@ String
 ValueNode_Switch::link_name(int i)const
 {
        assert(i>=0 && i<link_count());
+
        switch(i)
        {
        case 0: return "link_off";
@@ -141,6 +132,7 @@ String
 ValueNode_Switch::link_local_name(int i)const
 {
        assert(i>=0 && i<link_count());
+
        switch(i)
        {
        case 0: return "Link Off";
@@ -162,6 +154,9 @@ ValueNode_Switch::get_link_index_from_name(const String &name)const
 ValueBase
 ValueNode_Switch::operator()(Time t)const
 {
+       if (getenv("SYNFIG_DEBUG_VALUENODE_OPERATORS"))
+               printf("%s:%d operator()\n", __FILE__, __LINE__);
+
        return (*switch_)(t).get(bool()) ? (*link_on_)(t) : (*link_off_)(t);
 }