Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there

1 files changed, 6 insertions, 5 deletions

diff --git a/libs/ardour/ardour/panner_manager.h b/libs/ardour/ardour/panner_manager.h
index 619beb454f..80f8e8010a 100644
--- a/libs/ardour/ardour/panner_manager.h
+++ b/libs/ardour/ardour/panner_manager.h
@@ -20,7 +20,8 @@
 #ifndef __ardour_panner_manager_h__
 #define __ardour_panner_manager_h__
 
-#include <dlfcn.h>
+#include <glibmm/module.h>
+
 #include "ardour/panner.h"
 #include "ardour/session_handle.h"
 
@@ -28,15 +29,15 @@ namespace ARDOUR {
 
 struct LIBARDOUR_API PannerInfo {
 	PanPluginDescriptor descriptor;
-	void* module;
+	Glib::Module* module;
 
-	PannerInfo (PanPluginDescriptor& d, void* handle)
+	PannerInfo (PanPluginDescriptor& d, Glib::Module* m)
 	: descriptor (d)
-	, module (handle)
+	, module (m)
 	{}
 
 	~PannerInfo () {
-		dlclose (module);
+		delete module;
 	}
 };