X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_switch.cpp;h=195bd953100a7ba7c93e81cc363de3d54b7aa505;hb=ecff046513a5c0bd64db58b69fdd2fb42736bca7;hp=17f6af30109342d54f31225f549160f61d28523e;hpb=c6b0c050710376d3cf99b7c083a7c47f1a0516c9;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_switch.cpp b/synfig-core/trunk/src/synfig/valuenode_switch.cpp
index 17f6af3..195bd95 100644
--- a/synfig-core/trunk/src/synfig/valuenode_switch.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_switch.cpp
@@ -6,6 +6,7 @@
 **
 **	\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,30 +81,17 @@ 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
@@ -166,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);
 }