From 4e53aa9a828d8d80ca999dc24a817664f37c07bc Mon Sep 17 00:00:00 2001 From: psperl Date: Fri, 31 Aug 2007 00:25:20 +0000 Subject: [PATCH] update to libvisual-projectm to support new engine git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@364 6778bc44-b910-0410-a7a0-be141de4315d --- src/projectM-libvisual/ConfigFile.cpp | 142 ++++++++++++ src/projectM-libvisual/ConfigFile.h | 253 ++++++++++++++++++++++ src/projectM-libvisual/actor_projectM.cpp | 86 ++++---- 3 files changed, 436 insertions(+), 45 deletions(-) create mode 100644 src/projectM-libvisual/ConfigFile.cpp create mode 100644 src/projectM-libvisual/ConfigFile.h diff --git a/src/projectM-libvisual/ConfigFile.cpp b/src/projectM-libvisual/ConfigFile.cpp new file mode 100644 index 000000000..f041064e5 --- /dev/null +++ b/src/projectM-libvisual/ConfigFile.cpp @@ -0,0 +1,142 @@ +// ConfigFile.cpp + +#include "ConfigFile.h" + +using std::string; + +ConfigFile::ConfigFile( string filename, string delimiter, + string comment, string sentry ) + : myDelimiter(delimiter), myComment(comment), mySentry(sentry) +{ + // Construct a ConfigFile, getting keys and values from given file + + std::ifstream in( filename.c_str() ); + + if( !in ) throw file_not_found( filename ); + + in >> (*this); +} + + +ConfigFile::ConfigFile() + : myDelimiter( string(1,'=') ), myComment( string(1,'#') ) +{ + // Construct a ConfigFile without a file; empty +} + + +void ConfigFile::remove( const string& key ) +{ + // Remove key and its value + myContents.erase( myContents.find( key ) ); + return; +} + + +bool ConfigFile::keyExists( const string& key ) const +{ + // Indicate whether key is found + mapci p = myContents.find( key ); + return ( p != myContents.end() ); +} + + +/* static */ +void ConfigFile::trim( string& s ) +{ + // Remove leading and trailing whitespace + static const char whitespace[] = " \n\t\v\r\f"; + s.erase( 0, s.find_first_not_of(whitespace) ); + s.erase( s.find_last_not_of(whitespace) + 1U ); +} + + +std::ostream& operator<<( std::ostream& os, const ConfigFile& cf ) +{ + // Save a ConfigFile to os + for( ConfigFile::mapci p = cf.myContents.begin(); + p != cf.myContents.end(); + ++p ) + { + os << p->first << " " << cf.myDelimiter << " "; + os << p->second << std::endl; + } + return os; +} + + +std::istream& operator>>( std::istream& is, ConfigFile& cf ) +{ + // Load a ConfigFile from is + // Read in keys and values, keeping internal whitespace + typedef string::size_type pos; + const string& delim = cf.myDelimiter; // separator + const string& comm = cf.myComment; // comment + const string& sentry = cf.mySentry; // end of file sentry + const pos skip = delim.length(); // length of separator + + string nextline = ""; // might need to read ahead to see where value ends + + while( is || nextline.length() > 0 ) + { + // Read an entire line at a time + string line; + if( nextline.length() > 0 ) + { + line = nextline; // we read ahead; use it now + nextline = ""; + } + else + { + std::getline( is, line ); + } + + // Ignore comments + line = line.substr( 0, line.find(comm) ); + + // Check for end of file sentry + if( sentry != "" && line.find(sentry) != string::npos ) return is; + + // Parse the line if it contains a delimiter + pos delimPos = line.find( delim ); + if( delimPos < string::npos ) + { + // Extract the key + string key = line.substr( 0, delimPos ); + line.replace( 0, delimPos+skip, "" ); + + // See if value continues on the next line + // Stop at blank line, next line with a key, end of stream, + // or end of file sentry + bool terminate = false; + while( !terminate && is ) + { + std::getline( is, nextline ); + terminate = true; + + string nlcopy = nextline; + ConfigFile::trim(nlcopy); + if( nlcopy == "" ) continue; + + nextline = nextline.substr( 0, nextline.find(comm) ); + if( nextline.find(delim) != string::npos ) + continue; + if( sentry != "" && nextline.find(sentry) != string::npos ) + continue; + + nlcopy = nextline; + ConfigFile::trim(nlcopy); + if( nlcopy != "" ) line += "\n"; + line += nextline; + terminate = false; + } + + // Store key and value + ConfigFile::trim(key); + ConfigFile::trim(line); + cf.myContents[key] = line; // overwrites if key is repeated + } + } + + return is; +} diff --git a/src/projectM-libvisual/ConfigFile.h b/src/projectM-libvisual/ConfigFile.h new file mode 100644 index 000000000..c2f002447 --- /dev/null +++ b/src/projectM-libvisual/ConfigFile.h @@ -0,0 +1,253 @@ +// ConfigFile.h +// Class for reading named values from configuration files +// Richard J. Wagner v2.1 24 May 2004 wagnerr@umich.edu + +// Copyright (c) 2004 Richard J. Wagner +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to +// deal in the Software without restriction, including without limitation the +// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +// sell copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +// IN THE SOFTWARE. + +// Typical usage +// ------------- +// +// Given a configuration file "settings.inp": +// atoms = 25 +// length = 8.0 # nanometers +// name = Reece Surcher +// +// Named values are read in various ways, with or without default values: +// ConfigFile config( "settings.inp" ); +// int atoms = config.read( "atoms" ); +// double length = config.read( "length", 10.0 ); +// string author, title; +// config.readInto( author, "name" ); +// config.readInto( title, "title", string("Untitled") ); +// +// See file example.cpp for more examples. + +#ifndef CONFIGFILE_H +#define CONFIGFILE_H + +#include +#include +#include +#include +#include + +using std::string; + +class ConfigFile { +// Data +protected: + string myDelimiter; // separator between key and value + string myComment; // separator between value and comments + string mySentry; // optional string to signal end of file + std::map myContents; // extracted keys and values + + typedef std::map::iterator mapi; + typedef std::map::const_iterator mapci; + +// Methods +public: + ConfigFile( string filename, + string delimiter = "=", + string comment = "#", + string sentry = "EndConfigFile" ); + ConfigFile(); + + // Search for key and read value or optional default value + template T read( const string& key ) const; // call as read + template T read( const string& key, const T& value ) const; + template bool readInto( T& var, const string& key ) const; + template + bool readInto( T& var, const string& key, const T& value ) const; + + // Modify keys and values + template void add( string key, const T& value ); + void remove( const string& key ); + + // Check whether key exists in configuration + bool keyExists( const string& key ) const; + + // Check or change configuration syntax + string getDelimiter() const { return myDelimiter; } + string getComment() const { return myComment; } + string getSentry() const { return mySentry; } + string setDelimiter( const string& s ) + { string old = myDelimiter; myDelimiter = s; return old; } + string setComment( const string& s ) + { string old = myComment; myComment = s; return old; } + + // Write or read configuration + friend std::ostream& operator<<( std::ostream& os, const ConfigFile& cf ); + friend std::istream& operator>>( std::istream& is, ConfigFile& cf ); + +protected: + template static string T_as_string( const T& t ); + template static T string_as_T( const string& s ); + static void trim( string& s ); + + +// Exception types +public: + struct file_not_found { + string filename; + file_not_found( const string& filename_ = string() ) + : filename(filename_) {} }; + struct key_not_found { // thrown only by T read(key) variant of read() + string key; + key_not_found( const string& key_ = string() ) + : key(key_) {} }; +}; + + +/* static */ +template +string ConfigFile::T_as_string( const T& t ) +{ + // Convert from a T to a string + // Type T must support << operator + std::ostringstream ost; + ost << t; + return ost.str(); +} + + +/* static */ +template +T ConfigFile::string_as_T( const string& s ) +{ + // Convert from a string to a T + // Type T must support >> operator + T t; + std::istringstream ist(s); + ist >> t; + return t; +} + + +/* static */ +template<> +inline string ConfigFile::string_as_T( const string& s ) +{ + // Convert from a string to a string + // In other words, do nothing + return s; +} + + +/* static */ +template<> +inline bool ConfigFile::string_as_T( const string& s ) +{ + // Convert from a string to a bool + // Interpret "false", "F", "no", "n", "0" as false + // Interpret "true", "T", "yes", "y", "1", "-1", or anything else as true + bool b = true; + string sup = s; + for( string::iterator p = sup.begin(); p != sup.end(); ++p ) + *p = toupper(*p); // make string all caps + if( sup==string("FALSE") || sup==string("F") || + sup==string("NO") || sup==string("N") || + sup==string("0") || sup==string("NONE") ) + b = false; + return b; +} + + +template +T ConfigFile::read( const string& key ) const +{ + // Read the value corresponding to key + mapci p = myContents.find(key); + if( p == myContents.end() ) throw key_not_found(key); + return string_as_T( p->second ); +} + + +template +T ConfigFile::read( const string& key, const T& value ) const +{ + // Return the value corresponding to key or given default value + // if key is not found + mapci p = myContents.find(key); + if( p == myContents.end() ) return value; + return string_as_T( p->second ); +} + + +template +bool ConfigFile::readInto( T& var, const string& key ) const +{ + // Get the value corresponding to key and store in var + // Return true if key is found + // Otherwise leave var untouched + mapci p = myContents.find(key); + bool found = ( p != myContents.end() ); + if( found ) var = string_as_T( p->second ); + return found; +} + + +template +bool ConfigFile::readInto( T& var, const string& key, const T& value ) const +{ + // Get the value corresponding to key and store in var + // Return true if key is found + // Otherwise set var to given default + mapci p = myContents.find(key); + bool found = ( p != myContents.end() ); + if( found ) + var = string_as_T( p->second ); + else + var = value; + return found; +} + + +template +void ConfigFile::add( string key, const T& value ) +{ + // Add a key with given value + string v = T_as_string( value ); + trim(key); + trim(v); + myContents[key] = v; + return; +} + +#endif // CONFIGFILE_H + +// Release notes: +// v1.0 21 May 1999 +// + First release +// + Template read() access only through non-member readConfigFile() +// + ConfigurationFileBool is only built-in helper class +// +// v2.0 3 May 2002 +// + Shortened name from ConfigurationFile to ConfigFile +// + Implemented template member functions +// + Changed default comment separator from % to # +// + Enabled reading of multiple-line values +// +// v2.1 24 May 2004 +// + Made template specializations inline to avoid compiler-dependent linkage +// + Allowed comments within multiple-line values +// + Enabled blank line termination for multiple-line values +// + Added optional sentry to detect end of configuration file +// + Rewrote messy trimWhitespace() function as elegant trim() diff --git a/src/projectM-libvisual/actor_projectM.cpp b/src/projectM-libvisual/actor_projectM.cpp index d5a04a92c..a61ddc048 100644 --- a/src/projectM-libvisual/actor_projectM.cpp +++ b/src/projectM-libvisual/actor_projectM.cpp @@ -1,11 +1,11 @@ #include -using namespace std; #include #include #include #include #include +#include #include #include #include @@ -17,15 +17,15 @@ using namespace std; #include #include #include "lvtoprojectM.h" +#include "ConfigFile.h" -#define CONFIG_FILE "/share/projectM/config.1.00" -#define FONTS_DIR "/share/projectM/fonts" +#define CONFIG_FILE "/share/projectM/config.inp" -void read_config(); -char preset_dir[1024]; -char fonts_dir[1024]; + +std::string read_config(); + int texsize=512; int gx=32,gy=24; int wvw=512,wvh=512; @@ -97,8 +97,13 @@ extern "C" int lv_projectm_init (VisPluginData *plugin) { char projectM_data[1024]; ProjectmPrivate *priv; - - read_config(); + std::string config_file; + config_file = read_config(); + + ConfigFile config(config_file); + wvw = config.read( "Window Width", 512 ); + wvh = config.read( "Window Height", 512 ); + fullscreen = 0; /* Allocate the projectm private data structure, and register it as a private */ priv = new ProjectmPrivate; @@ -109,29 +114,10 @@ extern "C" int lv_projectm_init (VisPluginData *plugin) visual_object_set_private (VISUAL_OBJECT (plugin), priv); //FIXME - priv->PM = new projectM(); + priv->PM = new projectM(config_file); //globalPM = (projectM *)wipemalloc( sizeof( projectM ) ); - priv->PM->projectM_reset(); - - - strcpy(projectM_data, PROJECTM_DATADIR); - strcpy(projectM_data+strlen(PROJECTM_DATADIR), FONTS_DIR); - projectM_data[strlen(PROJECTM_DATADIR)+strlen(FONTS_DIR)]='\0'; - priv->PM->fontURL = (char *)malloc( sizeof( char ) * 1024 ); - strcpy( priv->PM->fontURL, projectM_data ); - - priv->PM->presetURL = (char *)malloc( sizeof( char ) * 1024 ); - strcpy( priv->PM->presetURL, preset_dir ); - - - //projectM_reset( globalPM ); - priv->PM->projectM_init(gx, gy, fps, texsize, fullscreen ? fvw:wvw, fullscreen? fvh:wvh); - - - - - priv->PM->projectM_resetGL( wvw, wvh ); + return 0; } @@ -259,7 +245,8 @@ extern "C" int lv_projectm_render (VisPluginData *plugin, VisVideo *video, VisAu } -void read_config() + +std::string read_config() { int n; @@ -278,17 +265,19 @@ void read_config() printf("dir:%s \n",projectM_config); home=getenv("HOME"); strcpy(projectM_home, home); - strcpy(projectM_home+strlen(home), "/.projectM/config.1.00"); - projectM_home[strlen(home)+strlen("/.projectM/config.1.00")]='\0'; + strcpy(projectM_home+strlen(home), "/.projectM/config.inp"); + projectM_home[strlen(home)+strlen("/.projectM/config.inp")]='\0'; if ((in = fopen(projectM_home, "r")) != 0) { - printf("reading ~/.projectM/config.1.00 \n"); + printf("reading ~/.projectM/config.inp \n"); + fclose(in); + return std::string(projectM_home); } else { - printf("trying to create ~/.projectM/config.1.00 \n"); + printf("trying to create ~/.projectM/config.inp \n"); strcpy(projectM_home, home); strcpy(projectM_home+strlen(home), "/.projectM"); @@ -296,8 +285,8 @@ void read_config() mkdir(projectM_home,0755); strcpy(projectM_home, home); - strcpy(projectM_home+strlen(home), "/.projectM/config.1.00"); - projectM_home[strlen(home)+strlen("/.projectM/config.1.00")]='\0'; + strcpy(projectM_home+strlen(home), "/.projectM/config.inp"); + projectM_home[strlen(home)+strlen("/.projectM/config.inp")]='\0'; if((out = fopen(projectM_home,"w"))!=0) { @@ -314,24 +303,30 @@ void read_config() if ((in = fopen(projectM_home, "r")) != 0) - { printf("created ~/.projectM/config.1.00 successfully\n"); } - else{printf("This shouldn't happen, using implementation defualts\n");return;} + { + printf("created ~/.projectM/config.inp successfully\n"); + fclose(in); + return std::string(projectM_home); + } + else{printf("This shouldn't happen, using implementation defualts\n");abort();} } - else{printf("Cannot find projectM default config, using implementation defaults\n");return;} + else{printf("Cannot find projectM default config, using implementation defaults\n");abort();} } else { - printf("Cannot create ~/.projectM/config.1.00, using default config file\n"); + printf("Cannot create ~/.projectM/config.inp, using default config file\n"); if ((in = fopen(projectM_config, "r")) != 0) - { printf("Successfully opened default config file\n");} - else{ printf("Using implementation defaults, your system is really messed up, I'm suprised we even got this far\n"); return;} + { printf("Successfully opened default config file\n"); + fclose(in); + return std::string(projectM_config);} + else{ printf("Using implementation defaults, your system is really messed up, I'm suprised we even got this far\n"); abort();} } } - + /* fgets(num, 512, in); fgets(num, 512, in); fgets(num, 512, in); if(fgets(num, 512, in) != NULL) sscanf (num, "%d", &texsize); @@ -356,7 +351,7 @@ void read_config() if(fgets(num, 512, in) != NULL) strcpy(preset_dir, num); preset_dir[strlen(preset_dir)-1]='\0'; - + */ /* fgets(num, 80, in); fgets(num, 80, in); @@ -375,8 +370,9 @@ void read_config() printf("%s %d\n", disp,strlen(disp)); setenv("LD_PRELOAD", "/usr/lib/tls/libGL.so.1.0.4496", 1); */ - fclose(in); + // fclose(in); + abort(); }