diff --git a/src/projectM-engine/projectM.cpp b/src/projectM-engine/projectM.cpp index 82970a05a..9aaf6fddf 100755 --- a/src/projectM-engine/projectM.cpp +++ b/src/projectM-engine/projectM.cpp @@ -79,9 +79,11 @@ double smoothDuration = 5; //int smoothFrame = 0; int oldFrame = 0; -DLLEXPORT projectM::projectM() :smoothFrame(0), beatDetect ( 0 ) +DLLEXPORT projectM::projectM(int gx, int gy, int fps, int texsize, int width, int height) :smoothFrame(0), beatDetect ( 0 ) { projectM_reset(); + projectM_init(gx, gy, fps, texsize, wvw, wvh); + projectM_resetGL( wvw, wvh ); } DLLEXPORT projectM::projectM(std::string config_file) :smoothFrame(0), beatDetect ( 0 ) @@ -92,7 +94,7 @@ DLLEXPORT projectM::projectM(std::string config_file) :smoothFrame(0), beatDete } -DLLEXPORT void projectM::readConfig(std::string config_file) +void projectM::readConfig(std::string config_file) { ConfigFile config(config_file); @@ -113,7 +115,7 @@ DLLEXPORT void projectM::readConfig(std::string config_file) presetURL = config.read( "Preset Path", "/usr/share/projectM/presets" ); fontURL = config.read( "Font Path", "/usr/share/projectM/fonts" ); - projectM_init(gx, gy, fps, texsize, wvw, wvh); + projectM_init(gx, gy, fps, texsize, wvw, wvh); projectM_resetGL( wvw, wvh ); } @@ -326,7 +328,7 @@ DLLEXPORT void projectM::projectM_reset() projectM_resetengine(); } -DLLEXPORT void projectM::projectM_init ( int gx, int gy, int fps, int texsize, int width, int height ) + void projectM::projectM_init ( int gx, int gy, int fps, int texsize, int width, int height ) { /** Initialise engine variables */ @@ -507,7 +509,7 @@ DLLEXPORT void projectM::projectM_init ( int gx, int gy, int fps, int texsize, i -DLLEXPORT void projectM::projectM_initengine() +void projectM::projectM_initengine() { /* PER FRAME CONSTANTS BEGIN */ @@ -644,7 +646,7 @@ DLLEXPORT void projectM::projectM_initengine() } /* Reinitializes the engine variables to a default (conservative and sane) value */ -DLLEXPORT void projectM::projectM_resetengine() +void projectM::projectM_resetengine() { this->presetOutputs.zoom=1.0; diff --git a/src/projectM-engine/projectM.hpp b/src/projectM-engine/projectM.hpp index 24d5dd09f..e3e325bb5 100755 --- a/src/projectM-engine/projectM.hpp +++ b/src/projectM-engine/projectM.hpp @@ -179,19 +179,19 @@ public: /** Functions */ - DLLEXPORT projectM(); + DLLEXPORT projectM(int gx, int gy, int fps, int texsize, int width, int height); - DLLEXPORT void projectM_init(int gx, int gy, int fps, int texsize, int width, int height); + void projectM_init(int gx, int gy, int fps, int texsize, int width, int height); void projectM_reset(); DLLEXPORT void projectM_resetGL( int width, int height ); DLLEXPORT void projectM_setTitle( char *title ); DLLEXPORT void renderFrame(); - DLLEXPORT void projectM_initengine(); - DLLEXPORT void projectM_resetengine(); + void projectM_initengine(); + void projectM_resetengine(); DLLEXPORT projectM(std::string config_file); - DLLEXPORT void readConfig(std::string config_file); + void readConfig(std::string config_file); void get_title();