Removed unused parameters.

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

diff --git a/synfig-core/trunk/src/synfig/loadcanvas.cpp b/synfig-core/trunk/src/synfig/loadcanvas.cpp
index bbb6d77..f4a91c8 100644 (file)
--- a/synfig-core/trunk/src/synfig/loadcanvas.cpp
+++ b/synfig-core/trunk/src/synfig/loadcanvas.cpp
@@ -234,7 +234,7 @@ CanvasParser::parse_keyframe(xmlpp::Element *element,Canvas::Handle canvas)
 
 
 Real
-CanvasParser::parse_real(xmlpp::Element *element,Canvas::Handle canvas)
+CanvasParser::parse_real(xmlpp::Element *element)
 {
        assert(element->get_name()=="real");
 
@@ -272,7 +272,7 @@ CanvasParser::parse_time(xmlpp::Element *element,Canvas::Handle canvas)
 }
 
 int
-CanvasParser::parse_integer(xmlpp::Element *element,Canvas::Handle canvas)
+CanvasParser::parse_integer(xmlpp::Element *element)
 {
        assert(element->get_name()=="integer");
 
@@ -291,7 +291,7 @@ CanvasParser::parse_integer(xmlpp::Element *element,Canvas::Handle canvas)
 }
 
 Vector
-CanvasParser::parse_vector(xmlpp::Element *element,Canvas::Handle canvas)
+CanvasParser::parse_vector(xmlpp::Element *element)
 {
        assert(element->get_name()=="vector");
 
@@ -336,7 +336,7 @@ CanvasParser::parse_vector(xmlpp::Element *element,Canvas::Handle canvas)
 }
 
 Color
-CanvasParser::parse_color(xmlpp::Element *element,Canvas::Handle canvas)
+CanvasParser::parse_color(xmlpp::Element *element)
 {
        assert(element->get_name()=="color");
 
@@ -346,7 +346,7 @@ CanvasParser::parse_color(xmlpp::Element *element,Canvas::Handle canvas)
                return Color();
        }
 
-       Color color;
+       Color color(0);
 
        xmlpp::Element::NodeList list = element->get_children();
        for(xmlpp::Element::NodeList::iterator iter = list.begin(); iter != list.end(); ++iter)
@@ -402,7 +402,7 @@ CanvasParser::parse_color(xmlpp::Element *element,Canvas::Handle canvas)
 }
 
 synfig::String
-CanvasParser::parse_string(xmlpp::Element *element,Canvas::Handle canvas)
+CanvasParser::parse_string(xmlpp::Element *element)
 {
        assert(element->get_name()=="string");
 
@@ -422,7 +422,7 @@ CanvasParser::parse_string(xmlpp::Element *element,Canvas::Handle canvas)
 }
 
 bool
-CanvasParser::parse_bool(xmlpp::Element *element,Canvas::Handle canvas)
+CanvasParser::parse_bool(xmlpp::Element *element)
 {
        assert(element->get_name()=="bool");
 
@@ -448,7 +448,7 @@ CanvasParser::parse_bool(xmlpp::Element *element,Canvas::Handle canvas)
 }
 
 Gradient
-CanvasParser::parse_gradient(xmlpp::Element *node,Canvas::Handle canvas)
+CanvasParser::parse_gradient(xmlpp::Element *node)
 {
        assert(node->get_name()=="gradient");
        Gradient ret;
@@ -462,7 +462,7 @@ CanvasParser::parse_gradient(xmlpp::Element *node,Canvas::Handle canvas)
                else
                {
                        Gradient::CPoint cpoint;
-                       cpoint.color=parse_color(child,canvas);
+                       cpoint.color=parse_color(child);
 
                        if(!child->get_attribute("pos"))
                        {
@@ -505,7 +505,7 @@ CanvasParser::parse_list(xmlpp::Element *element,Canvas::Handle canvas)
 }
 
 Segment
-CanvasParser::parse_segment(xmlpp::Element *element,Canvas::Handle canvas)
+CanvasParser::parse_segment(xmlpp::Element *element)
 {
        assert(element->get_name()=="segment");
 
@@ -545,7 +545,7 @@ CanvasParser::parse_segment(xmlpp::Element *element,Canvas::Handle canvas)
                                continue;
                        }
 
-                       seg.p1=parse_vector(dynamic_cast<xmlpp::Element*>(*iter),canvas);
+                       seg.p1=parse_vector(dynamic_cast<xmlpp::Element*>(*iter));
                }
                else
                if(child->get_name()=="t1")
@@ -569,7 +569,7 @@ CanvasParser::parse_segment(xmlpp::Element *element,Canvas::Handle canvas)
                                continue;
                        }
 
-                       seg.t1=parse_vector(dynamic_cast<xmlpp::Element*>(*iter),canvas);
+                       seg.t1=parse_vector(dynamic_cast<xmlpp::Element*>(*iter));
                }
                else
                if(child->get_name()=="p2")
@@ -593,7 +593,7 @@ CanvasParser::parse_segment(xmlpp::Element *element,Canvas::Handle canvas)
                                continue;
                        }
 
-                       seg.p2=parse_vector(dynamic_cast<xmlpp::Element*>(*iter),canvas);
+                       seg.p2=parse_vector(dynamic_cast<xmlpp::Element*>(*iter));
                }
                else
                if(child->get_name()=="t2")
@@ -617,7 +617,7 @@ CanvasParser::parse_segment(xmlpp::Element *element,Canvas::Handle canvas)
                                continue;
                        }
 
-                       seg.t2=parse_vector(dynamic_cast<xmlpp::Element*>(*iter),canvas);
+                       seg.t2=parse_vector(dynamic_cast<xmlpp::Element*>(*iter));
                }
                else
                        error_unexpected_element(child,child->get_name());
@@ -626,7 +626,7 @@ CanvasParser::parse_segment(xmlpp::Element *element,Canvas::Handle canvas)
 }
 
 BLinePoint
-CanvasParser::parse_bline_point(xmlpp::Element *element,Canvas::Handle canvas)
+CanvasParser::parse_bline_point(xmlpp::Element *element)
 {
        assert(element->get_name()=="bline_point");
        if(element->get_children().empty())
@@ -667,7 +667,7 @@ CanvasParser::parse_bline_point(xmlpp::Element *element,Canvas::Handle canvas)
                                continue;
                        }
 
-                       ret.set_vertex(parse_vector(dynamic_cast<xmlpp::Element*>(*iter),canvas));
+                       ret.set_vertex(parse_vector(dynamic_cast<xmlpp::Element*>(*iter)));
                }
                else
                // Tangent 1
@@ -692,7 +692,7 @@ CanvasParser::parse_bline_point(xmlpp::Element *element,Canvas::Handle canvas)
                                continue;
                        }
 
-                       ret.set_tangent1(parse_vector(dynamic_cast<xmlpp::Element*>(*iter),canvas));
+                       ret.set_tangent1(parse_vector(dynamic_cast<xmlpp::Element*>(*iter)));
                }
                else
                // Tangent 2
@@ -717,7 +717,7 @@ CanvasParser::parse_bline_point(xmlpp::Element *element,Canvas::Handle canvas)
                                continue;
                        }
 
-                       ret.set_tangent2(parse_vector(dynamic_cast<xmlpp::Element*>(*iter),canvas));
+                       ret.set_tangent2(parse_vector(dynamic_cast<xmlpp::Element*>(*iter)));
                        ret.set_split_tangent_flag(true);
                }
                else
@@ -743,7 +743,7 @@ CanvasParser::parse_bline_point(xmlpp::Element *element,Canvas::Handle canvas)
                                continue;
                        }
 
-                       ret.set_width(parse_real(dynamic_cast<xmlpp::Element*>(*iter),canvas));
+                       ret.set_width(parse_real(dynamic_cast<xmlpp::Element*>(*iter)));
                }
                else
                // origin
@@ -768,7 +768,7 @@ CanvasParser::parse_bline_point(xmlpp::Element *element,Canvas::Handle canvas)
                                continue;
                        }
 
-                       ret.set_origin(parse_real(dynamic_cast<xmlpp::Element*>(*iter),canvas));
+                       ret.set_origin(parse_real(dynamic_cast<xmlpp::Element*>(*iter)));
                }
                else
                        error_unexpected_element(child,child->get_name());
@@ -777,7 +777,7 @@ CanvasParser::parse_bline_point(xmlpp::Element *element,Canvas::Handle canvas)
 }
 
 Angle
-CanvasParser::parse_angle(xmlpp::Element *element,Canvas::Handle canvas)
+CanvasParser::parse_angle(xmlpp::Element *element)
 {
        assert(element->get_name()=="angle");
 
@@ -799,45 +799,43 @@ ValueBase
 CanvasParser::parse_value(xmlpp::Element *element,Canvas::Handle canvas)
 {
        if(element->get_name()=="real")
-               return parse_real(element,canvas);
+               return parse_real(element);
        else
        if(element->get_name()=="time")
                return parse_time(element,canvas);
        else
        if(element->get_name()=="integer")
-               return parse_integer(element,canvas);
+               return parse_integer(element);
        else
        if(element->get_name()=="string")
-               return parse_string(element,canvas);
+               return parse_string(element);
        else
        if(element->get_name()=="vector")
-       {
-               return parse_vector(element,canvas);
-       }
+               return parse_vector(element);
        else
        if(element->get_name()=="color")
-               return parse_color(element,canvas);
+               return parse_color(element);
        else
        if(element->get_name()=="segment")
-               return parse_segment(element,canvas);
+               return parse_segment(element);
        else
        if(element->get_name()=="list")
                return parse_list(element,canvas);
        else
        if(element->get_name()=="gradient")
-               return parse_gradient(element,canvas);
+               return parse_gradient(element);
        else
        if(element->get_name()=="bool")
-               return parse_bool(element,canvas);
+               return parse_bool(element);
        else
        //if(element->get_name()=="canvas")
        //      return parse_canvas(element,canvas,true);       // inline canvas
        //else
        if(element->get_name()=="angle" || element->get_name()=="degrees" || element->get_name()=="radians" || element->get_name()=="rotations")
-               return parse_angle(element,canvas);
+               return parse_angle(element);
        else
        if(element->get_name()=="bline_point")
-               return parse_bline_point(element,canvas);
+               return parse_bline_point(element);
        else
        if(element->get_name()=="canvas")
                return ValueBase(parse_canvas(element,canvas,true));
@@ -901,10 +899,22 @@ CanvasParser::parse_animated(xmlpp::Element *element,Canvas::Handle canvas)
 
 
                        ValueNode::Handle waypoint_value_node;
+                       xmlpp::Element::NodeList list = child->get_children();
 
                        if(child->get_attribute("use"))
                        {
-                               waypoint_value_node=canvas->surefind_value_node(child->get_attribute("use")->get_value());
+                               if(!list.empty())
+                                       warning(child,_("Found \"use\" attribute for <waypoint>, but it wasn't empty. Ignoring contents..."));
+
+                               // the waypoint might look like this, in which case we won't find "mycanvas" in the list of valuenodes, 'cos it's a canvas
+                               //
+                               //      <animated type="canvas">
+                               //        <waypoint time="0s" use="mycanvas"/>
+                               //      </animated>
+                               if (type==ValueBase::TYPE_CANVAS)
+                                       waypoint_value_node=ValueNode_Const::create(canvas->surefind_canvas(child->get_attribute("use")->get_value()));
+                               else
+                                       waypoint_value_node=canvas->surefind_value_node(child->get_attribute("use")->get_value());
                        }
                        else
                        {
@@ -914,7 +924,6 @@ CanvasParser::parse_animated(xmlpp::Element *element,Canvas::Handle canvas)
                                        continue;
                                }
 
-                               xmlpp::Element::NodeList list = child->get_children();
                                xmlpp::Element::NodeList::iterator iter;
 
                                // Search for the first non-text XML element
@@ -1031,31 +1040,6 @@ CanvasParser::parse_animated(xmlpp::Element *element,Canvas::Handle canvas)
        return value_node;
 }
 
-// This function is a phase-out hack for the timed swap value node
-etl::handle<ValueNode_Animated>
-CanvasParser::parse_timedswap(xmlpp::Element *node,Canvas::Handle canvas)
-{
-       ValueNode_TimedSwap::Handle timed_swap(parse_linkable_value_node(node,canvas));
-
-       assert(timed_swap);
-
-       ValueNode_Animated::Handle animated(ValueNode_Animated::create(timed_swap->get_type()));
-
-       animated->set_root_canvas(canvas->get_root());
-
-       assert(animated);
-
-       Time swap_time, swap_length;
-       (*timed_swap->get_swap_time())(0).put(&swap_time);
-       (*timed_swap->get_swap_length())(0).put(&swap_length);
-
-       animated->new_waypoint(swap_time-swap_length,timed_swap->get_before());
-       animated->new_waypoint(swap_time,timed_swap->get_after());
-
-       return animated;
-}
-
-
 handle<ValueNode_Subtract>
 CanvasParser::parse_subtract(xmlpp::Element *element,Canvas::Handle canvas)
 {
@@ -1601,6 +1585,10 @@ CanvasParser::parse_dynamic_list(xmlpp::Element *element,Canvas::Handle canvas)
                                        String timecode(begin_sequence.begin(), iter);
                                        int priority=0;
 
+                                       // skip whitespace before checking for a priority
+                                       while (isspace(timecode[0]))
+                                               timecode=timecode.substr(1);
+
                                        // If there is a priority, then grab it and remove
                                        // it from the timecode
                                        if(timecode[0]=='p')
@@ -1637,6 +1625,10 @@ CanvasParser::parse_dynamic_list(xmlpp::Element *element,Canvas::Handle canvas)
                                        String timecode(end_sequence.begin(),   iter);
                                        int priority=0;
 
+                                       // skip whitespace before checking for a priority
+                                       while (isspace(timecode[0]))
+                                               timecode=timecode.substr(1);
+
                                        // If there is a priority, then grab it and remove
                                        // it from the timecode
                                        if(timecode[0]=='p')
@@ -1670,6 +1662,7 @@ CanvasParser::parse_dynamic_list(xmlpp::Element *element,Canvas::Handle canvas)
 
                        if(child->get_attribute("use"))
                        {
+                               // \todo does this need to be able to read 'use="canvas"', like waypoints can now?  (see 'surefind_canvas' in this file)
                                string id=child->get_attribute("use")->get_value();
                                try
                                {
@@ -1764,9 +1757,6 @@ CanvasParser::parse_value_node(xmlpp::Element *element,Canvas::Handle canvas)
        if(element->get_name()=="bline") // This is not a typo. The dynamic list parser will parse a bline.
                value_node=parse_dynamic_list(element,canvas);
        else
-       if(element->get_name()=="timed_swap")
-               value_node=parse_timedswap(element,canvas);
-       else
        if(LinkableValueNode::book().count(element->get_name()))
                value_node=parse_linkable_value_node(element,canvas);
        else