X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fmain.cpp;h=61a263b1c574f0e50140f3d1bee01491ca0ed5d3;hb=4ba22fb51d97f1ecce04dcc5e40569a4354c1bae;hp=48b35460c5ba03f5d398b1873bc5a7a5b41fd9a4;hpb=28f28705612902c15cd0702cc891fba35bf2d2df;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/main.cpp b/synfig-core/trunk/src/synfig/main.cpp index 48b3546..61a263b 100644 --- a/synfig-core/trunk/src/synfig/main.cpp +++ b/synfig-core/trunk/src/synfig/main.cpp @@ -1,20 +1,22 @@ /* === S Y N F I G ========================================================= */ -/*! \file main.cpp +/*! \file synfig/main.cpp ** \brief \writeme ** -** $Id: main.cpp,v 1.3 2005/01/10 07:40:26 darco Exp $ +** $Id$ ** ** \legal -** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2007, 2008 Chris Moore ** -** 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 */ /* ========================================================================= */ @@ -53,10 +55,6 @@ #include "mutex.h" -#ifdef DEATH_TIME -#include -#endif - #ifdef HAVE_SIGNAL_H #include #endif @@ -79,13 +77,6 @@ static etl::reference_counter synfig_ref_count_(0); /* === M E T H O D S ======================================================= */ - - - - - - - const char * synfig::get_version() { @@ -102,21 +93,11 @@ synfig::get_build_date() return __DATE__; } -const char * -synfig::get_build_time() -{ - return __TIME__; -} - -extern const char *get_build_time(); - bool synfig::check_version_(int version,int vec_size, int color_size,int canvas_size,int layer_size) { bool ret=true; - CHECK_EXPIRE_TIME(); - if(version!=SYNFIG_LIBRARY_VERSION) { synfig::error(_("API Version mismatch (LIB:%d, PROG:%d)"),SYNFIG_LIBRARY_VERSION,version); @@ -142,70 +123,35 @@ synfig::check_version_(int version,int vec_size, int color_size,int canvas_size, synfig::error(_("Size of Layer mismatch (app:%d, lib:%d)"),layer_size,sizeof(Layer)); ret=false; } - + return ret; } -static void broken_pipe_signal (int sig) { +static void broken_pipe_signal (int /*sig*/) { synfig::warning("Broken Pipe..."); } bool retrieve_modules_to_load(String filename,std::list &modules_to_load) { - if(filename=="standard") + std::ifstream file(filename.c_str()); + + if(!file) { + // warning("Cannot open "+filename); return false; -/* - if(find(modules_to_load.begin(),modules_to_load.end(),"trgt_bmp")==modules_to_load.end()) - modules_to_load.push_back("trgt_bmp"); - if(find(modules_to_load.begin(),modules_to_load.end(),"trgt_gif")==modules_to_load.end()) - modules_to_load.push_back("trgt_gif"); - if(find(modules_to_load.begin(),modules_to_load.end(),"trgt_dv")==modules_to_load.end()) - modules_to_load.push_back("trgt_dv"); - if(find(modules_to_load.begin(),modules_to_load.end(),"mod_ffmpeg")==modules_to_load.end()) - modules_to_load.push_back("mod_ffmpeg"); - if(find(modules_to_load.begin(),modules_to_load.end(),"mod_imagemagick")==modules_to_load.end()) - modules_to_load.push_back("mod_imagemagick"); - if(find(modules_to_load.begin(),modules_to_load.end(),"lyr_std")==modules_to_load.end()) - modules_to_load.push_back("lyr_std"); - if(find(modules_to_load.begin(),modules_to_load.end(),"lyr_freetype")==modules_to_load.end()) - modules_to_load.push_back("lyr_freetype"); -#ifdef HAVE_LIBPNG - if(find(modules_to_load.begin(),modules_to_load.end(),"trgt_png")==modules_to_load.end()) - modules_to_load.push_back("trgt_png"); -#endif -#ifdef HAVE_OPENEXR - if(find(modules_to_load.begin(),modules_to_load.end(),"mod_openexr")==modules_to_load.end()) - modules_to_load.push_back("mod_openexr"); -#endif -*/ } - else + + while(file) { - std::ifstream file(filename.c_str()); - if(!file) - { - // warning("Cannot open "+filename); - return false; - } - while(file) - { - String modulename; - getline(file,modulename); - if(!modulename.empty() && find(modules_to_load.begin(),modules_to_load.end(),modulename)==modules_to_load.end()) - modules_to_load.push_back(modulename); - } + String modulename; + getline(file,modulename); + if(!modulename.empty() && find(modules_to_load.begin(),modules_to_load.end(),modulename)==modules_to_load.end()) + modules_to_load.push_back(modulename); } - - return true; } - - - - synfig::Main::Main(const synfig::String& basepath,ProgressCallback *cb): ref_count_(synfig_ref_count_) { @@ -214,24 +160,25 @@ synfig::Main::Main(const synfig::String& basepath,ProgressCallback *cb): synfig_ref_count_.reset(); ref_count_=synfig_ref_count_; - - // Add initialization after this point + // Add initialization after this point - CHECK_EXPIRE_TIME(); +#ifdef ENABLE_NLS + bindtextdomain("synfig", LOCALEDIR); +#endif String prefix=basepath+"/.."; - int i; + unsigned int i; #ifdef _DEBUG std::set_terminate(__gnu_cxx::__verbose_terminate_handler); #endif - + #if defined(HAVE_SIGNAL_H) && defined(SIGPIPE) signal(SIGPIPE, broken_pipe_signal); #endif - + //_config_search_path=new vector"string.h"(); - + // Init the subsystems if(cb)cb->amount_complete(0, 100); if(cb)cb->task(_("Starting Subsystem \"Modules\"")); @@ -252,7 +199,7 @@ synfig::Main::Main(const synfig::String& basepath,ProgressCallback *cb): Module::subsys_stop(); throw std::runtime_error(_("Unable to initialize subsystem \"Targets\"")); } - + if(cb)cb->task(_("Starting Subsystem \"Importers\"")); if(!Importer::subsys_init()) { @@ -271,80 +218,65 @@ synfig::Main::Main(const synfig::String& basepath,ProgressCallback *cb): Module::subsys_stop(); throw std::runtime_error(_("Unable to initialize subsystem \"ValueNodes\"")); } - + // Load up the list importer Importer::book()[String("lst")]=ListImporter::create; - - - // Load up the modules + // Load up the modules std::list modules_to_load; std::vector locations; - - if(!getenv("SYNFIG_MODULE_LIST")) + + if(getenv("SYNFIG_MODULE_LIST")) + locations.push_back(getenv("SYNFIG_MODULE_LIST")); + else { - locations.push_back("standard"); - locations.push_back("./"MODULE_LIST_FILENAME); //1 - locations.push_back("../etc/"MODULE_LIST_FILENAME); //1 - locations.push_back("~/.synfig/"MODULE_LIST_FILENAME); //2 - locations.push_back(prefix+"/etc/"+MODULE_LIST_FILENAME); //3 - locations.push_back("/usr/local/etc/"MODULE_LIST_FILENAME); + locations.push_back("./"MODULE_LIST_FILENAME); + locations.push_back("../etc/"MODULE_LIST_FILENAME); + if(getenv("HOME")) + locations.push_back(strprintf("%s/.synfig/%s", getenv("HOME"), MODULE_LIST_FILENAME)); #ifdef SYSCONFDIR locations.push_back(SYSCONFDIR"/"MODULE_LIST_FILENAME); #endif + locations.push_back(prefix+"/etc/"+MODULE_LIST_FILENAME); + locations.push_back("/usr/local/etc/"MODULE_LIST_FILENAME); #ifdef __APPLE__ locations.push_back("/Library/Frameworks/synfig.framework/Resources/"MODULE_LIST_FILENAME); locations.push_back("/Library/Synfig/"MODULE_LIST_FILENAME); - locations.push_back("~/Library/Synfig/"MODULE_LIST_FILENAME); + if(getenv("HOME")) + locations.push_back(strprintf("%s/Library/Synfig/%s", getenv("HOME"), MODULE_LIST_FILENAME)); #endif #ifdef WIN32 locations.push_back("C:\\Program Files\\Synfig\\etc\\"MODULE_LIST_FILENAME); #endif } - else - { - locations.push_back(getenv("SYNFIG_MODULE_LIST")); - } -/* - const char *locations[]= - { - "standard", //0 - "./"MODULE_LIST_FILENAME, //1 - "../etc/"MODULE_LIST_FILENAME, //1 - "~/.synfig/"MODULE_LIST_FILENAME, //2 - "/usr/local/lib/synfig/modules/"MODULE_LIST_FILENAME, //3 - "/usr/local/etc/"MODULE_LIST_FILENAME, -#ifdef SYSCONFDIR - SYSCONFDIR"/"MODULE_LIST_FILENAME, -#endif -#ifdef __APPLE__ - "/Library/Frameworks/synfig.framework/Resources/"MODULE_LIST_FILENAME, - "/Library/SYNFIG/"MODULE_LIST_FILENAME, - "~/Library/SYNFIG/"MODULE_LIST_FILENAME, -#endif -#ifdef WIN32 - "C:\\Program Files\\SYNFIG\\etc\\"MODULE_LIST_FILENAME, -#endif - }; -*/ - + for(i=0;itask(strprintf(_("Loading modules from %s"),locations[i].c_str())); - + break; + } + + if (i == locations.size()) + { + Importer::subsys_stop(); + Target::subsys_stop(); + Layer::subsys_stop(); + Module::subsys_stop(); + throw std::runtime_error(strprintf(_("Unable to open module list file '%s'"), MODULE_LIST_FILENAME)); + } + std::list::iterator iter; - + + Module::register_default_modules(cb); + for(i=0,iter=modules_to_load.begin();iter!=modules_to_load.end();++iter,i++) { Module::Register(*iter,cb); if(cb)cb->amount_complete((i+1)*100,modules_to_load.size()*100); } - -// load_modules(cb); - - CHECK_EXPIRE_TIME(); - if(cb)cb->amount_complete(100, 100); if(cb)cb->task(_("DONE")); } @@ -367,29 +299,38 @@ synfig::Main::~Main() synfig::warning("%s: count()=%d",iter->first.c_str(), iter->second.count()); } } - + + // synfig::info("ValueNode::subsys_stop()"); ValueNode::subsys_stop(); + // synfig::info("Importer::subsys_stop()"); Importer::subsys_stop(); + // synfig::info("Target::subsys_stop()"); Target::subsys_stop(); + // synfig::info("Layer::subsys_stop()"); Layer::subsys_stop(); - - /*! \fixme For some reason, uncommenting the next - ** line will cause things to crash. This needs to be - ** looked into at some point. */ - //Module::subsys_stop(); + /*! \todo For some reason, uncommenting the next line will cause things to crash. + This needs to be looked into at some point. */ + // synfig::info("Module::subsys_stop()"); + // Module::subsys_stop(); + // synfig::info("Exiting"); #if defined(HAVE_SIGNAL_H) && defined(SIGPIPE) signal(SIGPIPE, SIG_DFL); #endif } - - - - - - - +static const String +current_time() +{ + const int buflen = 50; + time_t t; + struct tm *lt; + char b[buflen]; + time(&t); + lt = localtime(&t); + strftime(b, buflen, " [%X] ", lt); + return String(b); +} void synfig::error(const char *format,...) @@ -403,7 +344,7 @@ void synfig::error(const String &str) { static Mutex mutex; Mutex::Lock lock(mutex); - cerr<<"synfig("<