Merge branch 'unstable' into trackhat-ui

3 files changed, 1 insertions, 15 deletions

diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp b/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp
index 56ae061f..73bf834a 100644
--- a/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp
+++ b/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp
@@ -178,7 +178,4 @@ bool FTNoIR_Protocol::correct()
     return true;
 }
 
-extern "C" OPENTRACK_EXPORT IProtocol* GetConstructor()
-{
-    return new FTNoIR_Protocol;
-}
+OPENTRACK_DECLARE_PROTOCOL(FTNoIR_Protocol, FTControls, FTNoIR_ProtocolDll)
diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft_dialog.cpp b/ftnoir_protocol_ft/ftnoir_protocol_ft_dialog.cpp
index 3e440607..db0165b5 100644
--- a/ftnoir_protocol_ft/ftnoir_protocol_ft_dialog.cpp
+++ b/ftnoir_protocol_ft/ftnoir_protocol_ft_dialog.cpp
@@ -72,7 +72,3 @@ void FTControls::selectDLL() {
     }
 }
 
-extern "C" OPENTRACK_EXPORT IProtocolDialog* GetDialog()
-{
-    return new FTControls;
-}
diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft_dll.cpp b/ftnoir_protocol_ft/ftnoir_protocol_ft_dll.cpp
deleted file mode 100644
index 13506022..00000000
--- a/ftnoir_protocol_ft/ftnoir_protocol_ft_dll.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "opentrack/plugin-api.hpp"
-#include "ftnoir_protocol_ft/ftnoir_protocol_ft.h"
-
-extern "C" OPENTRACK_EXPORT Metadata* GetMetadata()
-{
-    return new FTNoIR_ProtocolDll;
-}