MSVC: EXPORT macro fixes

include/Controller.h

@@ -27,6 +27,7 @@
 #ifndef CONTROLLER_H
 #define CONTROLLER_H
 
+#include "export.h"
 #include "Engine.h"
 #include "Model.h"
 #include "JournallingObject.h"
@@ -40,7 +41,7 @@ class ControllerConnection;
 typedef QVector<Controller *> ControllerVector;
 
 
-class Controller : public Model, public JournallingObject
+class EXPORT Controller : public Model, public JournallingObject
 {
 	Q_OBJECT
 public:

include/PlayHandle.h

@@ -28,6 +28,8 @@
 #include <QtCore/QList>
 #include <QtCore/QMutex>
 
+#include "export.h"
+
 #include "MemoryManager.h"
 
 #include "ThreadableJob.h"
@@ -38,7 +40,7 @@ class QThread;
 class Track;
 class AudioPort;
 
-class PlayHandle : public ThreadableJob
+class EXPORT PlayHandle : public ThreadableJob
 {
 public:
 	enum Types

include/export.h

@@ -22,6 +22,7 @@
  *
  */
 
+#include <QtCore/QtGlobal>
 
 #ifndef EXPORT_H
 #define EXPORT_H
@@ -31,10 +32,10 @@
 #ifdef LMMS_BUILD_WIN32
 
 #ifdef PLUGIN_NAME
-#define EXPORT __declspec(dllimport)
-#define PLUGIN_EXPORT __declspec(dllexport)
+#define EXPORT Q_DECL_IMPORT
+#define PLUGIN_EXPORT Q_DECL_EXPORT
 #else
-#define EXPORT __declspec(dllexport)
+#define EXPORT Q_DECL_EXPORT
 #endif
 
 #else

plugins/Amplifier/Amplifier.cpp

@@ -138,7 +138,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model* parent, void* data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model* parent, void* data )
 {
 	return new AmplifierEffect( parent, static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>( data ) );
 }

plugins/BassBooster/BassBooster.cpp

@@ -148,7 +148,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model* parent, void* data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model* parent, void* data )
 {
 	return new BassBoosterEffect( parent, static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>( data ) );
 }

plugins/Bitcrush/Bitcrush.cpp

@@ -244,7 +244,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model* parent, void* data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model* parent, void* data )
 {
 	return new BitcrushEffect( parent, static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>( data ) );
 }

plugins/CrossoverEQ/CrossoverEQ.cpp

@@ -215,7 +215,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model* parent, void* data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model* parent, void* data )
 {
 	return new CrossoverEQEffect( parent, static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>( data ) );
 }

plugins/Delay/DelayEffect.cpp

@@ -157,7 +157,7 @@ extern "C"
 {
 
 //needed for getting plugin out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model* parent, void* data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model* parent, void* data )
 {
 	return new DelayEffect( parent , static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>( data ) );
 }

plugins/DualFilter/DualFilter.cpp

@@ -222,7 +222,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model* parent, void* data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model* parent, void* data )
 {
 	return new DualFilterEffect( parent, static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>( data ) );
 }

plugins/Eq/EqEffect.cpp

@@ -418,7 +418,7 @@ extern "C"
 {
 
 //needed for getting plugin out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model* parent, void* data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model* parent, void* data )
 {
 	return new EqEffect( parent , static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>( data ) );
 }

plugins/Flanger/FlangerEffect.cpp

@@ -143,7 +143,7 @@ extern "C"
 {
 
 //needed for getting plugin out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model* parent, void* data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model* parent, void* data )
 {
 	return new FlangerEffect( parent , static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>( data ) );
 }

plugins/HydrogenImport/HydrogenImport.cpp

@@ -340,7 +340,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model *, void * _data )
 {
 	return new HydrogenImport( QString::fromUtf8(
 									static_cast<const char *>( _data ) ) );

plugins/LadspaEffect/LadspaEffect.cpp

@@ -593,7 +593,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model * _parent, void * _data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model * _parent, void * _data )
 {
 	return new LadspaEffect( _parent,
 		static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>(

plugins/MidiExport/MidiExport.cpp

@@ -347,7 +347,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model *, void * _data )
 {
 	return new MidiExport();
 }

plugins/MidiImport/MidiImport.cpp

@@ -611,7 +611,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model *, void * _data )
 {
 	return new MidiImport( QString::fromUtf8(
 									static_cast<const char *>( _data ) ) );

plugins/MultitapEcho/MultitapEcho.cpp

@@ -164,7 +164,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model* parent, void* data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model* parent, void* data )
 {
 	return new MultitapEchoEffect( parent, static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>( data ) );
 }

plugins/ReverbSC/ReverbSC.cpp

@@ -151,7 +151,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model* parent, void* data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model* parent, void* data )
 {
 	return new ReverbSCEffect( 
 		parent, 

plugins/SpectrumAnalyzer/SpectrumAnalyzer.cpp

@@ -163,7 +163,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model* parent, void* data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model* parent, void* data )
 {
 	return new SpectrumAnalyzer( parent, static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>( data ) );
 }

plugins/VstEffect/VstEffect.cpp

@@ -171,7 +171,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model * _parent, void * _data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model * _parent, void * _data )
 {
 	return new VstEffect( _parent,
 		static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>(

plugins/audio_file_processor/audio_file_processor.cpp

@@ -1319,7 +1319,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model *, void * _data )
 {
 	return new audioFileProcessor(
 				static_cast<InstrumentTrack *>( _data ) );

plugins/bit_invader/bit_invader.cpp

@@ -582,7 +582,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model *, void * _data )
 {
 	return( new bitInvader( static_cast<InstrumentTrack *>( _data ) ) );
 }

plugins/dynamics_processor/dynamics_processor.cpp

@@ -233,7 +233,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model * _parent, void * _data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model * _parent, void * _data )
 {
 	return( new dynProcEffect( _parent,
 		static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>(

plugins/kicker/kicker.cpp

@@ -367,7 +367,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model *, void * _data )
 {
 	return new kickerInstrument( static_cast<InstrumentTrack *>( _data ) );
 }

plugins/ladspa_browser/ladspa_browser.cpp

@@ -61,7 +61,7 @@ Plugin::Descriptor PLUGIN_EXPORT ladspabrowser_plugin_descriptor =
 
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model * _parent, void * _data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model * _parent, void * _data )
 {
 	return new ladspaBrowser;
 }

plugins/lb302/lb302.cpp

@@ -1041,7 +1041,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model *, void * _data )
 {
 
 	return( new lb302Synth(

plugins/monstro/Monstro.cpp

@@ -1963,7 +1963,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model *, void * _data )
 {
 	return new MonstroInstrument( static_cast<InstrumentTrack *>( _data ) );
 }

plugins/nes/Nes.cpp

@@ -917,7 +917,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model *, void * _data )
 {
 	return( new NesInstrument( static_cast<InstrumentTrack *>( _data ) ) );
 }

plugins/opl2/opl2instrument.cpp

@@ -77,7 +77,7 @@ Plugin::Descriptor PLUGIN_EXPORT OPL2_plugin_descriptor =
 };
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model *, void * _data )
 {
         return( new opl2instrument( static_cast<InstrumentTrack *>( _data ) ) );
 }

plugins/organic/organic.cpp

@@ -641,7 +641,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model *, void * _data )
 {
 	return( new organicInstrument( static_cast<InstrumentTrack *>( _data ) ) );
 }

plugins/papu/papu_instrument.cpp

@@ -738,7 +738,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model *, void * _data )
 {
 	return( new papuInstrument(
 				static_cast<InstrumentTrack *>( _data ) ) );

plugins/patman/patman.cpp

@@ -66,7 +66,7 @@ Plugin::Descriptor PLUGIN_EXPORT patman_plugin_descriptor =
 
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model *, void * _data )
 {
 	return new patmanInstrument( static_cast<InstrumentTrack *>( _data ) );
 }

plugins/peak_controller_effect/peak_controller_effect.cpp

@@ -148,7 +148,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model * _parent, void * _data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model * _parent, void * _data )
 {
 	return new PeakControllerEffect( _parent,
 		static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>( _data ) );

plugins/sfxr/sfxr.cpp

@@ -1119,7 +1119,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model*, void* data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model*, void* data )
 {
 	return new sfxrInstrument( static_cast<InstrumentTrack *>( data ) );
 }

plugins/sid/sid_instrument.cpp

@@ -822,7 +822,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model *, void * _data )
 {
 	return( new sidInstrument(
 				static_cast<InstrumentTrack *>( _data ) ) );

plugins/stereo_enhancer/stereo_enhancer.cpp

@@ -163,7 +163,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model * _parent, void * _data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model * _parent, void * _data )
 {
 	return( new stereoEnhancerEffect( _parent,
 		static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>(

plugins/stereo_matrix/stereo_matrix.cpp

@@ -113,7 +113,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model * _parent, void * _data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model * _parent, void * _data )
 {
 	return( new stereoMatrixEffect( _parent,
 		static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>(

plugins/triple_oscillator/TripleOscillator.cpp

@@ -791,7 +791,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model *, void * _data )
 {
 	return new TripleOscillator( static_cast<InstrumentTrack *>( _data ) );
 }

plugins/vestige/vestige.cpp

@@ -1141,7 +1141,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model *, void * _data )
 {
 	return new vestigeInstrument( static_cast<InstrumentTrack *>( _data ) );
 }

plugins/vibed/vibed.cpp

@@ -777,7 +777,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model *, void * _data )
 {
 	return( new vibed( static_cast<InstrumentTrack *>( _data ) ) );
 }

plugins/watsyn/Watsyn.cpp

@@ -1278,7 +1278,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model *, void * _data )
 {
 	return( new WatsynInstrument( static_cast<InstrumentTrack *>( _data ) ) );
 }

plugins/waveshaper/waveshaper.cpp

@@ -161,7 +161,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model * _parent, void * _data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model * _parent, void * _data )
 {
 	return( new waveShaperEffect( _parent,
 		static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>(

plugins/xpressive/expressive_plugin.cpp

@@ -877,7 +877,7 @@ __attribute__((destructor)) static void module_destroy()
 extern "C" {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main(Model *, void * _data) {
+PLUGIN_EXPORT Plugin * lmms_plugin_main(Model *, void * _data) {
 	return (new Expressive(static_cast<InstrumentTrack *>(_data)));
 }
 

plugins/zynaddsubfx/ZynAddSubFx.cpp

@@ -658,7 +658,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model *, void * _data )
 {
 
 	return new ZynAddSubFxInstrument( static_cast<InstrumentTrack *>( _data ) );