From 7fd04e076929c8fe4ef4196fe9a4ffd59929d6a2 Mon Sep 17 00:00:00 2001
From: Tobias Doerffel <tobias.doerffel@gmail.com>
Date: Fri, 23 Jul 2010 22:16:06 +0200
Subject: [PATCH] Plugins: export PluginDescriptors and lmms_plugin_main
 function

Various plugins were missing the PLUGIN_EXPORT declaration with their
PluginDescriptor instantiations and lmms_plugin_main implementation
which made some plugins not show up with latest Win32 build.
(cherry picked from commit f85898ba6e3d33421ce667e69f681984c6062d12)
---
 plugins/sf2_player/sf2_player.cpp | 6 +++---
 plugins/stk/mallets/mallets.cpp   | 7 ++++---
 plugins/vestige/vestige.cpp       | 4 ++--
 plugins/vst_base/vst_base.cpp     | 4 ++--
 plugins/vst_effect/VstEffect.cpp  | 6 +++---
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/plugins/sf2_player/sf2_player.cpp b/plugins/sf2_player/sf2_player.cpp
index ef7bfffc7..cab2bd919 100644
--- a/plugins/sf2_player/sf2_player.cpp
+++ b/plugins/sf2_player/sf2_player.cpp
@@ -2,7 +2,7 @@
  * sf2_player.cpp - a soundfont2 player using fluidSynth
  *
  * Copyright (c) 2008 Paul Giblock <drfaygo/at/gmail/dot/com>
- * Copyright (c) 2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2009-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  *
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -53,7 +53,7 @@ static const char * __supportedExts[] =
 extern "C"
 {
 
-Plugin::Descriptor sf2player_plugin_descriptor =
+Plugin::Descriptor PLUGIN_EXPORT sf2player_plugin_descriptor =
 {
 	STRINGIFY( PLUGIN_NAME ),
 	"Sf2 Player",
@@ -1109,7 +1109,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * lmms_plugin_main( Model *, void * _data )
+Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
 {
 	return new sf2Instrument( static_cast<InstrumentTrack *>( _data ) );
 }
diff --git a/plugins/stk/mallets/mallets.cpp b/plugins/stk/mallets/mallets.cpp
index 20b3b7c37..b03267b2e 100644
--- a/plugins/stk/mallets/mallets.cpp
+++ b/plugins/stk/mallets/mallets.cpp
@@ -2,7 +2,8 @@
  * mallets.cpp - tuned instruments that one would bang upon
  *
  * Copyright (c) 2006-2008 Danny McRae <khjklujn/at/users.sourceforge.net>
- * 
+ * Copyright (c) 2009-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ *
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
  * This program is free software; you can redistribute it and/or
@@ -41,7 +42,7 @@
 extern "C"
 {
 
-Plugin::Descriptor malletsstk_plugin_descriptor =
+Plugin::Descriptor PLUGIN_EXPORT malletsstk_plugin_descriptor =
 {
 	STRINGIFY( PLUGIN_NAME ),
 	"Mallets",
@@ -655,7 +656,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * lmms_plugin_main( Model *, void * _data )
+Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
 {
 	return new malletsInstrument( static_cast<InstrumentTrack *>( _data ) );
 }
diff --git a/plugins/vestige/vestige.cpp b/plugins/vestige/vestige.cpp
index d04ff3c94..99a4c0116 100644
--- a/plugins/vestige/vestige.cpp
+++ b/plugins/vestige/vestige.cpp
@@ -51,7 +51,7 @@ static const char * __supportedExts[] =
 extern "C"
 {
 
-Plugin::Descriptor vestige_plugin_descriptor =
+Plugin::Descriptor PLUGIN_EXPORT vestige_plugin_descriptor =
 {
 	STRINGIFY( PLUGIN_NAME ),
 	"VeSTige",
@@ -454,7 +454,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * lmms_plugin_main( Model *, void * _data )
+Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
 {
 	return new vestigeInstrument( static_cast<InstrumentTrack *>( _data ) );
 }
diff --git a/plugins/vst_base/vst_base.cpp b/plugins/vst_base/vst_base.cpp
index 51460fe19..f5ae7571f 100644
--- a/plugins/vst_base/vst_base.cpp
+++ b/plugins/vst_base/vst_base.cpp
@@ -2,7 +2,7 @@
  * vst_base.cpp - VST-base-code to be used by any LMMS plugins dealing with VST-
  *                plugins
  *
- * Copyright (c) 2006-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2006-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  *
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -31,7 +31,7 @@
 extern "C"
 {
 
-Plugin::Descriptor vstbase_plugin_descriptor =
+Plugin::Descriptor PLUGIN_EXPORT vstbase_plugin_descriptor =
 {
 	STRINGIFY( PLUGIN_NAME ),
 	"VST Base",
diff --git a/plugins/vst_effect/VstEffect.cpp b/plugins/vst_effect/VstEffect.cpp
index f228e6c19..2ada8ca14 100644
--- a/plugins/vst_effect/VstEffect.cpp
+++ b/plugins/vst_effect/VstEffect.cpp
@@ -1,7 +1,7 @@
 /*
  * VstEffect.cpp - class for handling VST effect plugins
  *
- * Copyright (c) 2006-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2006-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  *
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -35,7 +35,7 @@
 extern "C"
 {
 
-Plugin::Descriptor vsteffect_plugin_descriptor =
+Plugin::Descriptor PLUGIN_EXPORT vsteffect_plugin_descriptor =
 {
 	STRINGIFY( PLUGIN_NAME ),
 	"VST Effect",
@@ -175,7 +175,7 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Plugin * lmms_plugin_main( Model * _parent, void * _data )
+Plugin * PLUGIN_EXPORT lmms_plugin_main( Model * _parent, void * _data )
 {
 	return new VstEffect( _parent,
 		static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>(