-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
/*! \file main.cpp
-** \brief SINFG Tool
+** \brief SYNFIG Tool
**
** $Id: main.cpp,v 1.9 2005/01/23 04:41:10 darco Exp $
**
** \legal
-** Copyright (c) 2002 Robert B. Quattlebaum Jr.
+** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
-** This software and associated documentation
-** are CONFIDENTIAL and PROPRIETARY property of
-** the above-mentioned copyright holder.
+** This package is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License as
+** published by the Free Software Foundation; either version 2 of
+** the License, or (at your option) any later version.
**
-** You may not copy, print, publish, or in any
-** other way distribute this software without
-** a prior written agreement with
-** the copyright holder.
+** This package is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+** General Public License for more details.
** \endlegal
*/
/* ========================================================================= */
#include <ETL/clock>
#include <algorithm>
-#include <sinfg/loadcanvas.h>
-#include <sinfg/savecanvas.h>
-#include <sinfg/target_scanline.h>
-#include <sinfg/module.h>
-#include <sinfg/importer.h>
-#include <sinfg/layer.h>
-#include <sinfg/canvas.h>
-#include <sinfg/target.h>
-#include <sinfg/time.h>
-#include <sinfg/string.h>
-#include <sinfg/paramdesc.h>
-#include <sinfg/main.h>
-#include <sinfg/guid.h>
+#include <synfig/loadcanvas.h>
+#include <synfig/savecanvas.h>
+#include <synfig/target_scanline.h>
+#include <synfig/module.h>
+#include <synfig/importer.h>
+#include <synfig/layer.h>
+#include <synfig/canvas.h>
+#include <synfig/target.h>
+#include <synfig/time.h>
+#include <synfig/string.h>
+#include <synfig/paramdesc.h>
+#include <synfig/main.h>
+#include <synfig/guid.h>
#endif
using namespace std;
using namespace etl;
-using namespace sinfg;
+using namespace synfig;
/* === M A C R O S ========================================================= */
enum exit_code
{
- SINFGTOOL_OK =0,
- SINFGTOOL_FILENOTFOUND =1,
- SINFGTOOL_BORRED =2,
- SINFGTOOL_HELP =3,
- SINFGTOOL_UNKNOWNARGUMENT =4,
- SINFGTOOL_UNKNOWNERROR =5,
- SINFGTOOL_INVALIDTARGET =6,
- SINFGTOOL_RENDERFAILURE =7,
- SINFGTOOL_BLANK =8,
- SINFGTOOL_BADVERSION =9
+ SYNFIGTOOL_OK =0,
+ SYNFIGTOOL_FILENOTFOUND =1,
+ SYNFIGTOOL_BORRED =2,
+ SYNFIGTOOL_HELP =3,
+ SYNFIGTOOL_UNKNOWNARGUMENT =4,
+ SYNFIGTOOL_UNKNOWNERROR =5,
+ SYNFIGTOOL_INVALIDTARGET =6,
+ SYNFIGTOOL_RENDERFAILURE =7,
+ SYNFIGTOOL_BLANK =8,
+ SYNFIGTOOL_BADVERSION =9,
+ SYNFIGTOOL_MISSINGARGUMENT =10
};
#ifndef VERSION
#define VERSION "unknown"
-#define PACKAGE "sinfg-tool"
+#define PACKAGE "synfig-tool"
#endif
#ifdef DEFAULT_QUALITY
/* === M E T H O D S ======================================================= */
-class Progress : public sinfg::ProgressCallback
+class Progress : public synfig::ProgressCallback
{
const char *program;
}
};
-class RenderProgress : public sinfg::ProgressCallback
+class RenderProgress : public synfig::ProgressCallback
{
string taskname;
cout<<"GUID Test"<<endl;
for(int i=20;i;i--)
{
- cout<<sinfg::GUID().get_string()<<' '<<sinfg::GUID().get_string()<<endl;
+ cout<<synfig::GUID().get_string()<<' '<<synfig::GUID().get_string()<<endl;
}
}
for(next=arg_list.begin(),iter=next++;iter!=arg_list.end();iter=next++)
{
if(*iter == "--")
- return SINFGTOOL_OK;
+ return SYNFIGTOOL_OK;
if(*iter == "--signal-test")
{
signal_test();
- return SINFGTOOL_HELP;
+ return SYNFIGTOOL_HELP;
}
if(*iter == "--guid-test")
{
guid_test();
- return SINFGTOOL_HELP;
+ return SYNFIGTOOL_HELP;
}
{
display_help(1);
- return SINFGTOOL_HELP;
+ return SYNFIGTOOL_HELP;
}
if(*iter == "--info")
cout<<" with Borland Turbo C++ "<<(__TCPLUSPLUS__>>8)<<'.'<<((__TCPLUSPLUS__&255)>>4)<<'.'<<(__TCPLUSPLUS__&15);
#endif
- cout<<endl<<SINFG_COPYRIGHT<<endl;
+ cout<<endl<<SYNFIG_COPYRIGHT<<endl;
cout<<endl;
- return SINFGTOOL_HELP;
+ return SYNFIGTOOL_HELP;
}
if(*iter == "--layers")
{
Progress p(PACKAGE);
- sinfg::Main sinfg_main(dirname(progname),&p);
- sinfg::Layer::Book::iterator iter=sinfg::Layer::book().begin();
- for(;iter!=sinfg::Layer::book().end();iter++)
+ synfig::Main synfig_main(dirname(progname),&p);
+ synfig::Layer::Book::iterator iter=synfig::Layer::book().begin();
+ for(;iter!=synfig::Layer::book().end();iter++)
cout<<iter->first<<endl;
- return SINFGTOOL_HELP;
+ return SYNFIGTOOL_HELP;
}
if(*iter == "--layer-info")
{
Progress p(PACKAGE);
- sinfg::Main sinfg_main(dirname(progname),&p);
+ synfig::Main synfig_main(dirname(progname),&p);
iter=next++;
- Layer::Handle layer=sinfg::Layer::create(*iter);
+ Layer::Handle layer=synfig::Layer::create(*iter);
cout<<"Layer Name: "<<layer->get_name()<<endl;
cout<<"Localized Layer Name: "<<layer->get_local_name()<<endl;
cout<<"Version: "<<layer->get_version()<<endl;
cout<<"\tHint: "<<vocab.front().get_hint()<<endl;
}
- return SINFGTOOL_HELP;
+ return SYNFIGTOOL_HELP;
}
if(*iter == "--modules")
{
Progress p(PACKAGE);
- sinfg::Main sinfg_main(dirname(progname),&p);
- sinfg::Module::Book::iterator iter=sinfg::Module::book().begin();
- for(;iter!=sinfg::Module::book().end();iter++)
+ synfig::Main synfig_main(dirname(progname),&p);
+ synfig::Module::Book::iterator iter=synfig::Module::book().begin();
+ for(;iter!=synfig::Module::book().end();iter++)
cout<<iter->first<<endl;
- return SINFGTOOL_HELP;
+ return SYNFIGTOOL_HELP;
}
if(*iter == "--targets")
{
Progress p(PACKAGE);
- sinfg::Main sinfg_main(dirname(progname),&p);
- sinfg::Target::Book::iterator iter=sinfg::Target::book().begin();
- for(;iter!=sinfg::Target::book().end();iter++)
+ synfig::Main synfig_main(dirname(progname),&p);
+ synfig::Target::Book::iterator iter=synfig::Target::book().begin();
+ for(;iter!=synfig::Target::book().end();iter++)
cout<<iter->first<<endl;
- return SINFGTOOL_HELP;
+ return SYNFIGTOOL_HELP;
}
if(*iter == "--valuenodes")
{
Progress p(PACKAGE);
- sinfg::Main sinfg_main(dirname(progname),&p);
- sinfg::LinkableValueNode::Book::iterator iter=sinfg::LinkableValueNode::book().begin();
- for(;iter!=sinfg::LinkableValueNode::book().end();iter++)
+ synfig::Main synfig_main(dirname(progname),&p);
+ synfig::LinkableValueNode::Book::iterator iter=synfig::LinkableValueNode::book().begin();
+ for(;iter!=synfig::LinkableValueNode::book().end();iter++)
cout<<iter->first<<endl;
- return SINFGTOOL_HELP;
+ return SYNFIGTOOL_HELP;
}
if(*iter == "--importers")
{
Progress p(PACKAGE);
- sinfg::Main sinfg_main(dirname(progname),&p);
- sinfg::Importer::Book::iterator iter=sinfg::Importer::book().begin();
- for(;iter!=sinfg::Importer::book().end();iter++)
+ synfig::Main synfig_main(dirname(progname),&p);
+ synfig::Importer::Book::iterator iter=synfig::Importer::book().begin();
+ for(;iter!=synfig::Importer::book().end();iter++)
cout<<iter->first<<endl;
- return SINFGTOOL_HELP;
+ return SYNFIGTOOL_HELP;
}
if(*iter == "--version")
arg_list.erase(iter);
- return SINFGTOOL_HELP;
+ return SYNFIGTOOL_HELP;
}
if(*iter == "--license")
{
cerr<<PACKAGE<<" "<<VERSION<<endl;
- cout<<SINFG_COPYRIGHT<<endl<<endl;
+ cout<<SYNFIG_COPYRIGHT<<endl<<endl;
cerr<<"\
-** This software and associated documentation\n\
-** are CONFIDENTIAL and PROPRIETARY property of\n\
-** the above-mentioned copyright holder.\n\
+** This package is free software; you can redistribute it and/or\n\
+** modify it under the terms of the GNU General Public License as\n\
+** published by the Free Software Foundation; either version 2 of\n\
+** the License, or (at your option) any later version.\n\
**\n\
-** You may not use, copy, print, publish, or in\n\
-** any other way distribute or exploit this software\n\
-** without a prior written agreement with the\n\
-** copyright holder. " << endl << endl;
+** " << endl << endl;
arg_list.erase(iter);
- return SINFGTOOL_HELP;
+ return SYNFIGTOOL_HELP;
}
if(*iter == "-v")
}
}
- return SINFGTOOL_OK;
+ return SYNFIGTOOL_OK;
}
int extract_arg_cluster(arg_list_t &arg_list,arg_list_t &cluster)
if(*iter->begin() != '-')
{
//cerr<<*iter->begin()<<"-----------"<<endl;
- return SINFGTOOL_OK;
+ return SYNFIGTOOL_OK;
}
if(
cluster.push_back(*iter);
arg_list.erase(iter);
iter=next++;
+ if (iter==arg_list.end()) {
+ error("The `%s' flag requires a value. Use --help for a list of options.", cluster.back().c_str());
+ return SYNFIGTOOL_MISSINGARGUMENT;
+ }
}
cluster.push_back(*iter);
arg_list.erase(iter);
}
- return SINFGTOOL_OK;
+ return SYNFIGTOOL_OK;
}
int extract_RendDesc(arg_list_t &arg_list,RendDesc &desc)
w=atoi(iter->c_str());
arg_list.erase(iter);
}
- if(*iter=="-h")
+ else if(*iter=="-h")
{
arg_list.erase(iter);
iter=next++;
h=atoi(iter->c_str());
arg_list.erase(iter);
}
- if(*iter=="-a")
+ else if(*iter=="-a")
{
int a;
arg_list.erase(iter);
VERBOSE_OUT(1)<<strprintf(_("Antialiasing set to %d, (%d samples per pixel)"),a,a*a)<<endl;
arg_list.erase(iter);
}
- if(*iter=="-s")
+ else if(*iter=="-s")
{
arg_list.erase(iter);
iter=next++;
VERBOSE_OUT(1)<<strprintf(_("Span set to %d units"),span)<<endl;
arg_list.erase(iter);
}
- if(*iter=="--fps")
+ else if(*iter=="--fps")
{
arg_list.erase(iter);
iter=next++;
arg_list.erase(iter);
VERBOSE_OUT(1)<<strprintf(_("Frame rate set to %d frames per second"),fps)<<endl;
}
- if(*iter=="--dpi")
+ else if(*iter=="--dpi")
{
arg_list.erase(iter);
iter=next++;
arg_list.erase(iter);
VERBOSE_OUT(1)<<strprintf(_("Physical resolution set to %f dpi"),dpi)<<endl;
}
- if(*iter=="--dpi-x")
+ else if(*iter=="--dpi-x")
{
arg_list.erase(iter);
iter=next++;
arg_list.erase(iter);
VERBOSE_OUT(1)<<strprintf(_("Physical X resolution set to %f dpi"),dpi)<<endl;
}
- if(*iter=="--dpi-y")
+ else if(*iter=="--dpi-y")
{
arg_list.erase(iter);
iter=next++;
arg_list.erase(iter);
VERBOSE_OUT(1)<<strprintf(_("Physical Y resolution set to %f dpi"),dpi)<<endl;
}
- if(*iter=="--start-time" || *iter=="--begin-time")
+ else if(*iter=="--start-time" || *iter=="--begin-time")
{
arg_list.erase(iter);
iter=next++;
desc.set_time_start(Time(*iter,desc.get_frame_rate()));
arg_list.erase(iter);
}
- if(*iter=="--end-time")
+ else if(*iter=="--end-time")
{
arg_list.erase(iter);
iter=next++;
desc.set_time_end(Time(*iter,desc.get_frame_rate()));
arg_list.erase(iter);
}
- if(*iter=="--time")
+ else if(*iter=="--time")
{
arg_list.erase(iter);
iter=next++;
VERBOSE_OUT(1)<<_("Rendering frame at ")<<desc.get_time_start().get_string(desc.get_frame_rate())<<endl;
arg_list.erase(iter);
}
- if(*iter=="-g")
+ else if(*iter=="-g")
{
- sinfg::warning("Gamma argument is currently ignored");
+ synfig::warning("Gamma argument is currently ignored");
//arg_list.erase(iter);
//iter=next++;
//desc.set_gamma(Gamma(atof(iter->c_str())));
}
if(span)
desc.set_span(span);
- return SINFGTOOL_OK;
+ return SYNFIGTOOL_OK;
}
int extract_quality(arg_list_t &arg_list,int &quality)
}
}
- return SINFGTOOL_OK;
+ return SYNFIGTOOL_OK;
}
int extract_threads(arg_list_t &arg_list,int &threads)
}
}
- return SINFGTOOL_OK;
+ return SYNFIGTOOL_OK;
}
int extract_target(arg_list_t &arg_list,string &type)
}
}
- return SINFGTOOL_OK;
+ return SYNFIGTOOL_OK;
}
int extract_append(arg_list_t &arg_list,string &filename)
}
}
- return SINFGTOOL_OK;
+ return SYNFIGTOOL_OK;
}
int extract_outfile(arg_list_t &arg_list,string &outfile)
{
arg_list_t::iterator iter, next;
- int ret=SINFGTOOL_FILENOTFOUND;
+ int ret=SYNFIGTOOL_FILENOTFOUND;
outfile.clear();
for(next=arg_list.begin(),iter=next++;iter!=arg_list.end();iter=next++)
iter=next++;
outfile=*iter;
arg_list.erase(iter);
- ret=SINFGTOOL_OK;
+ ret=SYNFIGTOOL_OK;
}
}
}
}
- return SINFGTOOL_OK;
+ return SYNFIGTOOL_OK;
}
/* === M E T H O D S ======================================================= */
progname=argv[0];
Progress p(argv[0]);
- if(!SINFG_CHECK_VERSION())
+ if(!SYNFIG_CHECK_VERSION())
{
- cerr<<_("FATAL: Sinfg Version Mismatch")<<endl;
- return SINFGTOOL_BADVERSION;
+ cerr<<_("FATAL: Synfig Version Mismatch")<<endl;
+ return SYNFIGTOOL_BADVERSION;
}
if(argc==1)
{
display_help(0);
- return SINFGTOOL_BLANK;
+ return SYNFIGTOOL_BLANK;
}
for(i=1;i<argc;i++)
return i;
VERBOSE_OUT(1)<<_("verbosity set to ")<<verbosity<<endl;
- sinfg::Main sinfg_main(dirname(progname),&p);
+ synfig::Main synfig_main(dirname(progname),&p);
{
arg_list_t defaults, imageargs;
+ int ret;
// Grab the defaults before the first file
- extract_arg_cluster(arg_list,defaults);
+ if ((ret = extract_arg_cluster(arg_list,defaults)) != SYNFIGTOOL_OK)
+ return ret;
while(arg_list.size())
{
job_list.front().filename=arg_list.front();
arg_list.pop_front();
- extract_arg_cluster(arg_list,imageargs);
+ if ((ret = extract_arg_cluster(arg_list,imageargs)) != SYNFIGTOOL_OK)
+ return ret;
// Open the composition
{
}
catch(std::length_error)
{
- sinfg::warning("Length error caught when attempting to figure out target name");
+ synfig::warning("Length error caught when attempting to figure out target name");
}
// If the target type is STILL not yet defined, then
VERBOSE_OUT(4)<<"outfile_name="<<job_list.front().outfilename<<endl;
VERBOSE_OUT(4)<<_("Creating the target...")<<endl;
- job_list.front().target=sinfg::Target::create(target_name,job_list.front().outfilename);
+ job_list.front().target=synfig::Target::create(target_name,job_list.front().outfilename);
if(target_name=="sif")
{
for(;arg_list.size();arg_list.pop_front())
cerr<<' '<<arg_list.front();
cerr<<endl;
- return SINFGTOOL_UNKNOWNARGUMENT;
+ return SYNFIGTOOL_UNKNOWNARGUMENT;
}
if(!job_list.size())
{
cerr<<_("Nothing to do!")<<endl;
- return SINFGTOOL_BORRED;
+ return SYNFIGTOOL_BORRED;
}
for(;job_list.size();job_list.pop_front())
if(!job_list.front().target->render(&p))
{
cerr<<"Render Failure."<<endl;
- return SINFGTOOL_RENDERFAILURE;
+ return SYNFIGTOOL_RENDERFAILURE;
}
if(print_benchmarks)
{
if(!save_canvas(job_list.front().outfilename,job_list.front().canvas))
{
cerr<<"Render Failure."<<endl;
- return SINFGTOOL_RENDERFAILURE;
+ return SYNFIGTOOL_RENDERFAILURE;
}
}
}
VERBOSE_OUT(1)<<_("Done.")<<endl;
- return SINFGTOOL_OK;
+ return SYNFIGTOOL_OK;
}