**
** \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
#include "gradient.h"
#include <errno.h>
+extern "C" {
+#include <libxml/tree.h>
+}
+
#endif
/* === U S I N G =========================================================== */
return root;
}
-xmlpp::Element* encode_time(xmlpp::Element* root,Time t, float fps=0)
+xmlpp::Element* encode_time(xmlpp::Element* root,Time t, float /*fps*/=0)
{
root->set_name("time");
//root->set_attribute("value",t.get_string(fps));
root->set_name("nil");
return root;
default:
- synfig::error(strprintf("Unknown value(%s), cannot create XML representation!",ValueBase::type_name(data.get_type()).c_str()));
+ synfig::error(strprintf(_("Unknown value(%s), cannot create XML representation!"),ValueBase::type_local_name(data.get_type()).c_str()));
root->set_name("nil");
return root;
}
//waypoint_node->add_child(encode_value(iter->get_value(),canvas));
if(iter->get_value_node()->is_exported())
waypoint_node->set_attribute("use",iter->get_value_node()->get_relative_id(canvas));
- else
- encode_value_node(waypoint_node->add_child("value_node"),iter->get_value_node(),canvas);
+ else {
+ ValueNode::ConstHandle value_node = iter->get_value_node();
+ if(ValueNode_Const::ConstHandle::cast_dynamic(value_node)) {
+ const ValueBase data = ValueNode_Const::ConstHandle::cast_dynamic(value_node)->get_value();
+ if (data.get_type() == ValueBase::TYPE_CANVAS)
+ waypoint_node->set_attribute("use",data.get(Canvas::Handle()).get()->get_relative_id(canvas));
+ else
+ encode_value_node(waypoint_node->add_child("value_node"),iter->get_value_node(),canvas);
+ }
+ else
+ encode_value_node(waypoint_node->add_child("value_node"),iter->get_value_node(),canvas);
+ }
switch(iter->get_before())
{
waypoint_node->set_attribute("before","constant");
break;
case INTERPOLATION_TCB:
- // This is the default value, so don't add a new attribute
+ waypoint_node->set_attribute("before","auto");
break;
default:
error("Unknown waypoint type for \"before\" attribute");
waypoint_node->set_attribute("after","constant");
break;
case INTERPOLATION_TCB:
- // This is the default value, so don't add a new attribute
+ waypoint_node->set_attribute("after","auto");
break;
default:
- error("Unknown waypoint type for \"before\" attribute");
+ error("Unknown waypoint type for \"after\" attribute");
}
if(iter->get_tension()!=0.0)
int i;
for(i=0;i<value_node->link_count();i++)
{
- string name(strprintf("c%d",i+1));
+ string name(value_node->link_name(i));
assert(value_node->get_link(i));
if(value_node->get_link(i)->is_exported())
root->set_attribute(name,value_node->get_link(i)->get_relative_id(canvas));
handle<const ValueNode> value_node=dynamic_param_list.find(iter->get_name())->second;
- // If the valuenode.has no ID, then it must be defined in-place
+ // If the valuenode has no ID, then it must be defined in-place
if(value_node->get_id().empty())
{
encode_value_node(node->add_child("value_node"),value_node,layer->get_canvas().constant());
continue;
}
- if(value.get_type()==ValueBase::TYPE_CANVAS && !value.get(Canvas::LooseHandle())->is_inline())
+ if(value.get_type()==ValueBase::TYPE_CANVAS)
{
- Canvas::Handle child(value.get(Canvas::LooseHandle()));
+ // the ->is_inline() below was crashing if the canvas
+ // contained a PasteCanvas with the default <No Image
+ // Selected> Canvas setting; this avoids the crash
+ if (!value.get(Canvas::LooseHandle()))
+ continue;
+
+ if (!value.get(Canvas::LooseHandle())->is_inline())
+ {
+ Canvas::Handle child(value.get(Canvas::LooseHandle()));
- if(!value.get(Canvas::Handle()))
+ if(!value.get(Canvas::Handle()))
+ continue;
+ xmlpp::Element *node=root->add_child("param");
+ node->set_attribute("name",iter->get_name());
+ node->set_attribute("use",child->get_relative_id(layer->get_canvas()));
continue;
- xmlpp::Element *node=root->add_child("param");
- node->set_attribute("name",iter->get_name());
- node->set_attribute("use",child->get_relative_id(layer->get_canvas()));
- continue;
+ }
}
xmlpp::Element *node=root->add_child("param");
node->set_attribute("name",iter->get_name());
root->set_name("canvas");
if(canvas->is_root())
- root->set_attribute("version","0.1");
+ root->set_attribute("version",canvas->get_version());
if(!canvas->get_id().empty() && !canvas->is_root() && !canvas->is_inline())
root->set_attribute("id",canvas->get_id());
}
// Output the <defs> section
- if(!canvas->is_inline() && !canvas->value_node_list().empty() || !canvas->children().empty())
+ //! \todo check where the parentheses should really go - around the && or the ||?
+ if((!canvas->is_inline() && !canvas->value_node_list().empty()) || !canvas->children().empty())
{
xmlpp::Element *node=root->add_child("defs");
const ValueNodeList &value_node_list(canvas->value_node_list());
synfig::String tmp_filename(filename+".TMP");
+ if (filename_extension(filename) == ".sifz")
+ xmlSetCompressMode(9);
+ else
+ xmlSetCompressMode(0);
+
try
{
assert(canvas);