From 2b8fd5d3652d99c31f123482457569739d500883 Mon Sep 17 00:00:00 2001 From: amoe Date: Sat, 25 Jul 2009 11:18:57 +0000 Subject: [PATCH] Bug #1849729. Adding class DLLEXPORT attributes, removing method-specific ones. git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1249 6778bc44-b910-0410-a7a0-be141de4315d --- src/libprojectM/KeyHandler.cpp | 2 +- .../MilkdropPresetFactory/Eval.hpp | 2 +- .../MilkdropPresetFactory/Expr.cpp | 2 +- .../MilkdropPresetFactory/Expr.hpp | 2 +- .../MilkdropPresetFactory/Func.hpp | 4 ++-- .../MilkdropPresetFactory.hpp | 4 ++-- src/libprojectM/PCM.hpp | 4 +++- src/libprojectM/Renderer/BeatDetect.cpp | 4 ++-- src/libprojectM/Renderer/BeatDetect.hpp | 4 +++- src/libprojectM/projectM.cpp | 14 ++++++------ src/libprojectM/projectM.hpp | 22 +++++++++---------- 11 files changed, 34 insertions(+), 30 deletions(-) diff --git a/src/libprojectM/KeyHandler.cpp b/src/libprojectM/KeyHandler.cpp index 675bfe7ef..5f8c8342a 100755 --- a/src/libprojectM/KeyHandler.cpp +++ b/src/libprojectM/KeyHandler.cpp @@ -61,7 +61,7 @@ void refreshConsole() { } -DLLEXPORT void projectM::key_handler( projectMEvent event, +void projectM::key_handler( projectMEvent event, projectMKeycode keycode, projectMModifier modifier ) { switch( event ) { diff --git a/src/libprojectM/MilkdropPresetFactory/Eval.hpp b/src/libprojectM/MilkdropPresetFactory/Eval.hpp index c59820818..51bd22f7b 100755 --- a/src/libprojectM/MilkdropPresetFactory/Eval.hpp +++ b/src/libprojectM/MilkdropPresetFactory/Eval.hpp @@ -55,7 +55,7 @@ #define INFIX_OR 5 #define INFIX_AND 6 -class InfixOp; +class DLLEXPORT InfixOp; class Eval { public: diff --git a/src/libprojectM/MilkdropPresetFactory/Expr.cpp b/src/libprojectM/MilkdropPresetFactory/Expr.cpp index bee57e3db..58142ad35 100755 --- a/src/libprojectM/MilkdropPresetFactory/Expr.cpp +++ b/src/libprojectM/MilkdropPresetFactory/Expr.cpp @@ -363,7 +363,7 @@ TreeExpr::~TreeExpr() } /* Initializes an infix operator */ -DLLEXPORT InfixOp::InfixOp ( int type, int precedence ) +InfixOp::InfixOp ( int type, int precedence ) { this->type = type; diff --git a/src/libprojectM/MilkdropPresetFactory/Expr.hpp b/src/libprojectM/MilkdropPresetFactory/Expr.hpp index a33e89e95..b732531af 100755 --- a/src/libprojectM/MilkdropPresetFactory/Expr.hpp +++ b/src/libprojectM/MilkdropPresetFactory/Expr.hpp @@ -46,7 +46,7 @@ public: int type; int precedence; - DLLEXPORT InfixOp( int type, int precedence ); + InfixOp( int type, int precedence ); }; /** Term */ diff --git a/src/libprojectM/MilkdropPresetFactory/Func.hpp b/src/libprojectM/MilkdropPresetFactory/Func.hpp index 296d8508e..ae571b75a 100755 --- a/src/libprojectM/MilkdropPresetFactory/Func.hpp +++ b/src/libprojectM/MilkdropPresetFactory/Func.hpp @@ -33,7 +33,7 @@ #include /* Function Type */ -class Func { +class DLLEXPORT Func { public: /// Create a new function wrapper object @@ -43,7 +43,7 @@ public: Func(const std::string & name, float (*func_ptr)(float*), int num_args ); /* Public Prototypes */ - DLLEXPORT ~Func(); + ~Func(); inline const std::string & getName() const { return name; diff --git a/src/libprojectM/MilkdropPresetFactory/MilkdropPresetFactory.hpp b/src/libprojectM/MilkdropPresetFactory/MilkdropPresetFactory.hpp index cbf549dea..ec347605c 100644 --- a/src/libprojectM/MilkdropPresetFactory/MilkdropPresetFactory.hpp +++ b/src/libprojectM/MilkdropPresetFactory/MilkdropPresetFactory.hpp @@ -15,8 +15,8 @@ #include #include "../PresetFactory.hpp" -class PresetOutputs; -class PresetInputs; +class DLLEXPORT PresetOutputs; +class DLLEXPORT PresetInputs; class MilkdropPresetFactory : public PresetFactory { diff --git a/src/libprojectM/PCM.hpp b/src/libprojectM/PCM.hpp index c75ce0ace..7c2dfb670 100755 --- a/src/libprojectM/PCM.hpp +++ b/src/libprojectM/PCM.hpp @@ -29,7 +29,9 @@ #ifndef _PCM_H #define _PCM_H -class PCM { +#include "dlldefs.h" + +class DLLEXPORT PCM { public: float **PCMd; int start; diff --git a/src/libprojectM/Renderer/BeatDetect.cpp b/src/libprojectM/Renderer/BeatDetect.cpp index df89a8f68..106b544d5 100755 --- a/src/libprojectM/Renderer/BeatDetect.cpp +++ b/src/libprojectM/Renderer/BeatDetect.cpp @@ -36,7 +36,7 @@ #include #include "BeatDetect.hpp" -DLLEXPORT BeatDetect::BeatDetect(PCM *pcm) { +BeatDetect::BeatDetect(PCM *pcm) { int x,y; this->pcm=pcm; @@ -75,7 +75,7 @@ DLLEXPORT BeatDetect::BeatDetect(PCM *pcm) { } -DLLEXPORT BeatDetect::~BeatDetect() +BeatDetect::~BeatDetect() { } diff --git a/src/libprojectM/Renderer/BeatDetect.hpp b/src/libprojectM/Renderer/BeatDetect.hpp index 5d16693a6..4dc3881ae 100755 --- a/src/libprojectM/Renderer/BeatDetect.hpp +++ b/src/libprojectM/Renderer/BeatDetect.hpp @@ -32,8 +32,10 @@ #define _BEAT_DETECT_H #include "../PCM.hpp" +#include "../dlldefs.h" -class BeatDetect + +class DLLEXPORT BeatDetect { public: float treb ; diff --git a/src/libprojectM/projectM.cpp b/src/libprojectM/projectM.cpp index cedf6ad76..c0b6d32b0 100755 --- a/src/libprojectM/projectM.cpp +++ b/src/libprojectM/projectM.cpp @@ -93,18 +93,18 @@ projectM::~projectM() delete(_pipelineContext); } -DLLEXPORT unsigned projectM::initRenderToTexture() +unsigned projectM::initRenderToTexture() { return renderer->initRenderToTexture(); } -DLLEXPORT void projectM::projectM_resetTextures() +void projectM::projectM_resetTextures() { renderer->ResetTextures(); } -DLLEXPORT projectM::projectM ( std::string config_file, int flags) : +projectM::projectM ( std::string config_file, int flags) : beatDetect ( 0 ), renderer ( 0 ), _pcm(0), m_presetPos(0), m_flags(flags), _pipelineContext(new PipelineContext()) { readConfig(config_file); @@ -113,7 +113,7 @@ DLLEXPORT projectM::projectM ( std::string config_file, int flags) : } -DLLEXPORT projectM::projectM(Settings settings, int flags): +projectM::projectM(Settings settings, int flags): beatDetect ( 0 ), renderer ( 0 ), _pcm(0), m_presetPos(0), m_flags(flags), _pipelineContext(new PipelineContext()) { readSettings(settings); @@ -288,7 +288,7 @@ void projectM::evaluateSecondPreset() } -DLLEXPORT void projectM::renderFrame() +void projectM::renderFrame() { #ifdef DEBUG @@ -512,7 +512,7 @@ void projectM::projectM_resetengine() } /** Resets OpenGL state */ -DLLEXPORT void projectM::projectM_resetGL ( int w, int h ) +void projectM::projectM_resetGL ( int w, int h ) { /** Stash the new dimensions */ @@ -521,7 +521,7 @@ DLLEXPORT void projectM::projectM_resetGL ( int w, int h ) } /** Sets the title to display */ -DLLEXPORT void projectM::projectM_setTitle ( std::string title ) { +void projectM::projectM_setTitle ( std::string title ) { if ( title != renderer->title ) { diff --git a/src/libprojectM/projectM.hpp b/src/libprojectM/projectM.hpp index 723992829..c523604cb 100755 --- a/src/libprojectM/projectM.hpp +++ b/src/libprojectM/projectM.hpp @@ -114,7 +114,7 @@ class RandomizerFunctor { }; -class projectM +class DLLEXPORT projectM { public: static const int FLAG_NONE = 0; @@ -138,26 +138,26 @@ public: bool shuffleEnabled; }; - DLLEXPORT projectM(std::string config_file, int flags = FLAG_NONE); - DLLEXPORT projectM(Settings settings, int flags = FLAG_NONE); + projectM(std::string config_file, int flags = FLAG_NONE); + projectM(Settings settings, int flags = FLAG_NONE); //DLLEXPORT projectM(int gx, int gy, int fps, int texsize, int width, int height,std::string preset_url,std::string title_fonturl, std::string title_menuurl); - DLLEXPORT void projectM_resetGL( int width, int height ); - DLLEXPORT void projectM_resetTextures(); - DLLEXPORT void projectM_setTitle( std::string title ); - DLLEXPORT void renderFrame(); - DLLEXPORT unsigned initRenderToTexture(); - DLLEXPORT void key_handler( projectMEvent event, + void projectM_resetGL( int width, int height ); + void projectM_resetTextures(); + void projectM_setTitle( std::string title ); + void renderFrame(); + unsigned initRenderToTexture(); + void key_handler( projectMEvent event, projectMKeycode keycode, projectMModifier modifier ); - DLLEXPORT virtual ~projectM(); + virtual ~projectM(); - DLLEXPORT const Settings & settings() const { + const Settings & settings() const { return _settings; }