Same for 'after' waypoints, too!

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

diff --git a/synfig-core/trunk/src/synfig/savecanvas.cpp b/synfig-core/trunk/src/synfig/savecanvas.cpp
index 4f37a25..58d40ed 100644 (file)
--- a/synfig-core/trunk/src/synfig/savecanvas.cpp
+++ b/synfig-core/trunk/src/synfig/savecanvas.cpp
@@ -292,9 +292,7 @@ xmlpp::Element* encode_animated(xmlpp::Element* root,ValueNode_Animated::ConstHa
                        waypoint_node->set_attribute("before","halt");
                        break;
                case INTERPOLATION_LINEAR:
-                       // This is the default value for angles, so don't add a new attribute for them
-                       if (value_node->get_type() != ValueBase::TYPE_ANGLE)
-                               waypoint_node->set_attribute("before","linear");
+                       waypoint_node->set_attribute("before","linear");
                        break;
                case INTERPOLATION_MANUAL:
                        waypoint_node->set_attribute("before","manual");
@@ -303,9 +301,7 @@ xmlpp::Element* encode_animated(xmlpp::Element* root,ValueNode_Animated::ConstHa
                        waypoint_node->set_attribute("before","constant");
                        break;
                case INTERPOLATION_TCB:
-                       // This is the default value, so don't add a new attribute (unless it's an angle - they default to linear)
-                       if (value_node->get_type() == ValueBase::TYPE_ANGLE)
-                               waypoint_node->set_attribute("before","auto");
+                       waypoint_node->set_attribute("before","auto");
                        break;
                default:
                        error("Unknown waypoint type for \"before\" attribute");
@@ -317,9 +313,7 @@ xmlpp::Element* encode_animated(xmlpp::Element* root,ValueNode_Animated::ConstHa
                        waypoint_node->set_attribute("after","halt");
                        break;
                case INTERPOLATION_LINEAR:
-                       // This is the default value for angles, so don't add a new attribute for them
-                       if (value_node->get_type() != ValueBase::TYPE_ANGLE)
-                               waypoint_node->set_attribute("after","linear");
+                       waypoint_node->set_attribute("after","linear");
                        break;
                case INTERPOLATION_MANUAL:
                        waypoint_node->set_attribute("after","manual");
@@ -328,9 +322,7 @@ xmlpp::Element* encode_animated(xmlpp::Element* root,ValueNode_Animated::ConstHa
                        waypoint_node->set_attribute("after","constant");
                        break;
                case INTERPOLATION_TCB:
-                       // This is the default value, so don't add a new attribute (unless it's an angle - they default to linear)
-                       if (value_node->get_type() == ValueBase::TYPE_ANGLE)
-                               waypoint_node->set_attribute("after","auto");
+                       waypoint_node->set_attribute("after","auto");
                        break;
                default:
                        error("Unknown waypoint type for \"after\" attribute");
@@ -752,7 +744,7 @@ synfig::save_canvas(const String &filename, Canvas::ConstHandle canvas)
 
        synfig::String tmp_filename(filename+".TMP");
 
-       if (String(filename.begin() + filename.find_last_of('.')+1, filename.end()) == "sifz")
+       if (filename_extension(filename) == ".sifz")
                xmlSetCompressMode(9);
        else
                xmlSetCompressMode(0);