X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fmain.cpp;h=d926754dd555ced125a3290666338e9950664186;hb=b494445bc3ba5344e65869c7c6bab2b008438f1c;hp=b253c3b258fec5eb1c32b42ac728c351f0fb8c78;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/main.cpp b/synfig-core/trunk/src/synfig/main.cpp index b253c3b..d926754 100644 --- a/synfig-core/trunk/src/synfig/main.cpp +++ b/synfig-core/trunk/src/synfig/main.cpp @@ -1,27 +1,28 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file main.cpp ** \brief \writeme ** ** $Id: main.cpp,v 1.3 2005/01/10 07:40:26 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 */ /* ========================================================================= */ /* === H E A D E R S ======================================================= */ -//#define SINFG_NO_ANGLE +//#define SYNFIG_NO_ANGLE #ifdef USING_PCH # include "pch.h" @@ -65,15 +66,15 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ -#define MODULE_LIST_FILENAME "sinfg_modules.cfg" +#define MODULE_LIST_FILENAME "synfig_modules.cfg" /* === S T A T I C S ======================================================= */ -static etl::reference_counter sinfg_ref_count_(0); +static etl::reference_counter synfig_ref_count_(0); /* === P R O C E D U R E S ================================================= */ @@ -87,7 +88,7 @@ static etl::reference_counter sinfg_ref_count_(0); const char * -sinfg::get_version() +synfig::get_version() { #ifdef VERSION return VERSION; @@ -97,13 +98,13 @@ sinfg::get_version() } const char * -sinfg::get_build_date() +synfig::get_build_date() { return __DATE__; } const char * -sinfg::get_build_time() +synfig::get_build_time() { return __TIME__; } @@ -111,35 +112,35 @@ sinfg::get_build_time() extern const char *get_build_time(); bool -sinfg::check_version_(int version,int vec_size, int color_size,int canvas_size,int layer_size) +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!=SINFG_LIBRARY_VERSION) + if(version!=SYNFIG_LIBRARY_VERSION) { - sinfg::error(_("API Version mismatch (LIB:%d, PROG:%d)"),SINFG_LIBRARY_VERSION,version); + synfig::error(_("API Version mismatch (LIB:%d, PROG:%d)"),SYNFIG_LIBRARY_VERSION,version); ret=false; } if(vec_size!=sizeof(Vector)) { - sinfg::error(_("Size of Vector mismatch (app:%d, lib:%d)"),vec_size,sizeof(Vector)); + synfig::error(_("Size of Vector mismatch (app:%d, lib:%d)"),vec_size,sizeof(Vector)); ret=false; } if(color_size!=sizeof(Color)) { - sinfg::error(_("Size of Color mismatch (app:%d, lib:%d)"),color_size,sizeof(Color)); + synfig::error(_("Size of Color mismatch (app:%d, lib:%d)"),color_size,sizeof(Color)); ret=false; } if(canvas_size!=sizeof(Canvas)) { - sinfg::error(_("Size of Canvas mismatch (app:%d, lib:%d)"),canvas_size,sizeof(Canvas)); + synfig::error(_("Size of Canvas mismatch (app:%d, lib:%d)"),canvas_size,sizeof(Canvas)); ret=false; } if(layer_size!=sizeof(Layer)) { - sinfg::error(_("Size of Layer mismatch (app:%d, lib:%d)"),layer_size,sizeof(Layer)); + synfig::error(_("Size of Layer mismatch (app:%d, lib:%d)"),layer_size,sizeof(Layer)); ret=false; } @@ -147,7 +148,7 @@ sinfg::check_version_(int version,int vec_size, int color_size,int canvas_size,i } static void broken_pipe_signal (int sig) { - sinfg::warning("Broken Pipe..."); + synfig::warning("Broken Pipe..."); } bool retrieve_modules_to_load(String filename,std::list &modules_to_load) @@ -206,14 +207,14 @@ bool retrieve_modules_to_load(String filename,std::list &modules_to_load -sinfg::Main::Main(const sinfg::String& basepath,ProgressCallback *cb): - ref_count_(sinfg_ref_count_) +synfig::Main::Main(const synfig::String& basepath,ProgressCallback *cb): + ref_count_(synfig_ref_count_) { if(ref_count_.count()) return; - sinfg_ref_count_.reset(); - ref_count_=sinfg_ref_count_; + synfig_ref_count_.reset(); + ref_count_=synfig_ref_count_; // Add initialization after this point @@ -286,7 +287,7 @@ sinfg::Main::Main(const sinfg::String& basepath,ProgressCallback *cb): locations.push_back("standard"); locations.push_back("./"MODULE_LIST_FILENAME); //1 locations.push_back("../etc/"MODULE_LIST_FILENAME); //1 - locations.push_back("~/.sinfg/"MODULE_LIST_FILENAME); //2 + 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); #ifdef SYSCONFDIR @@ -311,19 +312,19 @@ sinfg::Main::Main(const sinfg::String& basepath,ProgressCallback *cb): "standard", //0 "./"MODULE_LIST_FILENAME, //1 "../etc/"MODULE_LIST_FILENAME, //1 - "~/.sinfg/"MODULE_LIST_FILENAME, //2 - "/usr/local/lib/sinfg/modules/"MODULE_LIST_FILENAME, //3 + "~/.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/sinfg.framework/Resources/"MODULE_LIST_FILENAME, - "/Library/SINFG/"MODULE_LIST_FILENAME, - "~/Library/SINFG/"MODULE_LIST_FILENAME, + "/Library/Frameworks/synfig.framework/Resources/"MODULE_LIST_FILENAME, + "/Library/SYNFIG/"MODULE_LIST_FILENAME, + "~/Library/SYNFIG/"MODULE_LIST_FILENAME, #endif #ifdef WIN32 - "C:\\Program Files\\SINFG\\etc\\"MODULE_LIST_FILENAME, + "C:\\Program Files\\SYNFIG\\etc\\"MODULE_LIST_FILENAME, #endif }; */ @@ -349,22 +350,22 @@ sinfg::Main::Main(const sinfg::String& basepath,ProgressCallback *cb): if(cb)cb->task(_("DONE")); } -sinfg::Main::~Main() +synfig::Main::~Main() { ref_count_.detach(); - if(!sinfg_ref_count_.unique()) + if(!synfig_ref_count_.unique()) return; - sinfg_ref_count_.detach(); + synfig_ref_count_.detach(); // Add deinitialization after this point if(get_open_canvas_map().size()) { - sinfg::warning("Canvases still open!"); - std::map >::iterator iter; + synfig::warning("Canvases still open!"); + std::map >::iterator iter; for(iter=get_open_canvas_map().begin();iter!=get_open_canvas_map().end();++iter) { - sinfg::warning("%s: count()=%d",iter->first.c_str(), iter->second.count()); + synfig::warning("%s: count()=%d",iter->first.c_str(), iter->second.count()); } } @@ -392,7 +393,7 @@ sinfg::Main::~Main() void -sinfg::error(const char *format,...) +synfig::error(const char *format,...) { va_list args; va_start(args,format); @@ -400,14 +401,14 @@ sinfg::error(const char *format,...) } void -sinfg::error(const String &str) +synfig::error(const String &str) { static Mutex mutex; Mutex::Lock lock(mutex); - cerr<<"sinfg("<