Author: Carlos Lopez <[email protected]>
Date: Fri Feb 10 21:43:14 2012 +0100
For png target use the sequence separator string.
---
synfig-core/src/modules/mod_png/trgt_png.cpp | 6 ++++--
synfig-core/src/modules/mod_png/trgt_png.h | 1 +
synfig-core/src/synfig/targetparam.h | 3 ++-
synfig-studio/src/gui/render.cpp | 1 +
4 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/synfig-core/src/modules/mod_png/trgt_png.cpp
b/synfig-core/src/modules/mod_png/trgt_png.cpp
index 853a651..093f546 100644
--- a/synfig-core/src/modules/mod_png/trgt_png.cpp
+++ b/synfig-core/src/modules/mod_png/trgt_png.cpp
@@ -78,13 +78,14 @@ png_trgt::png_out_warning(png_struct *png_data,const char
*msg)
//Target *png_trgt::New(const char *filename){ return new png_trgt(filename);}
png_trgt::png_trgt(const char *Filename,
- const synfig::TargetParam& /* params */)
+ const synfig::TargetParam& params )
{
file=NULL;
filename=Filename;
buffer=NULL;
ready=false;
color_buffer=0;
+ sequence_separator=params.sequence_separator;
}
png_trgt::~png_trgt()
@@ -140,7 +141,8 @@ png_trgt::start_frame(synfig::ProgressCallback *callback)
else if(multi_image)
{
String newfilename(filename_sans_extension(filename) +
-
etl::strprintf(".%04d",imagecount) +
+ sequence_separator +
+
etl::strprintf("%04d",imagecount) +
filename_extension(filename));
file=fopen(newfilename.c_str(),POPEN_BINARY_WRITE_TYPE);
if(callback)callback->task(newfilename);
diff --git a/synfig-core/src/modules/mod_png/trgt_png.h
b/synfig-core/src/modules/mod_png/trgt_png.h
index 350b6f2..1feb323 100644
--- a/synfig-core/src/modules/mod_png/trgt_png.h
+++ b/synfig-core/src/modules/mod_png/trgt_png.h
@@ -57,6 +57,7 @@ private:
synfig::String filename;
unsigned char *buffer;
synfig::Color *color_buffer;
+ synfig::String sequence_separator;
public:
png_trgt(const char *filename, const synfig::TargetParam& /* params */);
virtual ~png_trgt();
diff --git a/synfig-core/src/synfig/targetparam.h
b/synfig-core/src/synfig/targetparam.h
index 05c815d..0a06181 100644
--- a/synfig-core/src/synfig/targetparam.h
+++ b/synfig-core/src/synfig/targetparam.h
@@ -38,7 +38,7 @@ struct TargetParam
* passing them to the target module, it would override them with
* its own valid default settings.
*/
- TargetParam (): video_codec("none"), bitrate(-1) { }
+ TargetParam (): video_codec("none"), bitrate(-1),
sequence_separator(".") { }
TargetParam (const std::string& Video_codec, int Bitrate):
video_codec(Video_codec), bitrate(Bitrate)
@@ -46,6 +46,7 @@ struct TargetParam
std::string video_codec;
int bitrate;
+ std::string sequence_separator;
};
}; // END of namespace synfig
diff --git a/synfig-studio/src/gui/render.cpp b/synfig-studio/src/gui/render.cpp
index 01485d4..c5eae9c 100644
--- a/synfig-studio/src/gui/render.cpp
+++ b/synfig-studio/src/gui/render.cpp
@@ -71,6 +71,7 @@ RenderSettings::RenderSettings(Gtk::Window& parent,
etl::handle<synfigapp::Canva
toggle_single_frame(_("Use _current frame"), true),
tparam("mpeg4",200)
{
+ tparam.sequence_separator=App::sequence_separator;
widget_rend_desc.show();
widget_rend_desc.signal_changed().connect(sigc::mem_fun(*this,&studio::RenderSettings::on_rend_desc_changed));
widget_rend_desc.set_rend_desc(canvas_interface_->get_canvas()->rend_desc());
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl
