Revert "Add support for building DLLs on Windows"

This reverts commit 9f824f0.
mixxxdj · Jan 15, 2021 · 64cfc92 · 64cfc92
1 parent 1c55a91
commit 64cfc92
Show file tree

Hide file tree

Showing 18 changed files with 26 additions and 40 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,13 +26,11 @@ add_library(keyfinder
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 find_package(FFTW3 REQUIRED)
 target_link_libraries(keyfinder PUBLIC FFTW3::fftw3)
+
 target_include_directories(keyfinder PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
-if(MSVC AND BUILD_SHARED_LIBS)
-  target_compile_definitions(keyfinder PRIVATE KEYFINDER_DLLEXPORT)
-endif()
 
 #
 # Installation

diff --git a/src/audiodata.h b/src/audiodata.h
@@ -26,7 +26,7 @@
 
 namespace KeyFinder {
 
-  class KEYFINDER_DECLSPEC AudioData {
+  class AudioData {
   public:
     AudioData();
 

diff --git a/src/binode.h b/src/binode.h
@@ -22,12 +22,10 @@
 #ifndef BINODE_H
 #define BINODE_H
 
-#include "constants.h"
-
 namespace KeyFinder {
 
   template <class T>
-  class KEYFINDER_DECLSPEC Binode {
+  class Binode {
   public:
     Binode(T x = 0): l(0), r(0), data(x) {}
     Binode* l, *r;

diff --git a/src/chromagram.h b/src/chromagram.h
@@ -26,7 +26,7 @@
 
 namespace KeyFinder {
 
-  class KEYFINDER_DECLSPEC Chromagram {
+  class Chromagram {
   public:
     Chromagram(unsigned int hops = 0);
     void append(const Chromagram& that);

diff --git a/src/chromatransform.h b/src/chromatransform.h
@@ -27,7 +27,7 @@
 
 namespace KeyFinder {
 
-  class KEYFINDER_DECLSPEC ChromaTransform {
+  class ChromaTransform {
   public:
     ChromaTransform(unsigned int frameRate);
     std::vector<double> chromaVector(const FftAdapter* const fft) const;

diff --git a/src/chromatransformfactory.h b/src/chromatransformfactory.h
@@ -22,12 +22,12 @@
 #ifndef CHROMATRANSFORMFACTORY_H
 #define CHROMATRANSFORMFACTORY_H
 
-#include "chromatransform.h"
 #include "constants.h"
+#include "chromatransform.h"
 
 namespace KeyFinder {
 
-  class KEYFINDER_DECLSPEC ChromaTransformFactory {
+  class ChromaTransformFactory {
   public:
     ChromaTransformFactory();
     ~ChromaTransformFactory();
@@ -38,7 +38,7 @@ namespace KeyFinder {
     std::mutex chromaTransformFactoryMutex;
   };
 
-  class KEYFINDER_DECLSPEC ChromaTransformFactory::ChromaTransformWrapper {
+  class ChromaTransformFactory::ChromaTransformWrapper {
   public:
     ChromaTransformWrapper(unsigned int frameRate, const ChromaTransform* const transform);
     ~ChromaTransformWrapper();

diff --git a/src/constants.h b/src/constants.h
@@ -22,12 +22,6 @@
 #ifndef CONSTANTS_H
 #define CONSTANTS_H
 
-#ifdef KEYFINDER_DLLEXPORT
-#define KEYFINDER_DECLSPEC __declspec(dllexport)
-#else
-#define KEYFINDER_DECLSPEC
-#endif
-
 #include <cmath>
 #include <vector>
 #include <deque>
@@ -101,11 +95,11 @@ namespace KeyFinder {
     SCALE_MINOR
   };
 
-  KEYFINDER_DECLSPEC double getFrequencyOfBand(unsigned int band);
-  KEYFINDER_DECLSPEC double getLastFrequency();
+  double getFrequencyOfBand(unsigned int band);
+  double getLastFrequency();
 
-  KEYFINDER_DECLSPEC const std::vector<double>& toneProfileMajor();
-  KEYFINDER_DECLSPEC const std::vector<double>& toneProfileMinor();
+  const std::vector<double>& toneProfileMajor();
+  const std::vector<double>& toneProfileMinor();
 }
 
 #endif
diff --git a/src/exception.h b/src/exception.h
@@ -25,11 +25,9 @@
 #include <stdexcept>
 #include <sstream>
 
-#include "constants.h"
-
 namespace KeyFinder {
 
-  class KEYFINDER_DECLSPEC Exception : public std::runtime_error {
+  class Exception : public std::runtime_error {
   public:
     Exception(const char* msg) : std::runtime_error(msg) { }
   };

diff --git a/src/fftadapter.h b/src/fftadapter.h
@@ -29,7 +29,7 @@ namespace KeyFinder {
   class FftAdapterPrivate;
   class InverseFftAdapterPrivate;
 
-  class KEYFINDER_DECLSPEC FftAdapter {
+  class FftAdapter {
   public:
     FftAdapter(unsigned int frameSize);
     ~FftAdapter();
@@ -44,7 +44,7 @@ namespace KeyFinder {
     FftAdapterPrivate* priv;
   };
 
-  class KEYFINDER_DECLSPEC InverseFftAdapter {
+  class InverseFftAdapter {
   public:
     InverseFftAdapter(unsigned int frameSize);
     ~InverseFftAdapter();

diff --git a/src/keyclassifier.h b/src/keyclassifier.h
@@ -27,7 +27,7 @@
 
 namespace KeyFinder {
 
-  class KEYFINDER_DECLSPEC KeyClassifier {
+  class KeyClassifier {
   public:
     KeyClassifier(const std::vector<double>& majorProfile, const std::vector<double>& minorProfile);
     ~KeyClassifier();

diff --git a/src/keyfinder.h b/src/keyfinder.h
@@ -23,15 +23,14 @@
 #define KEYFINDER_H
 
 #include "audiodata.h"
-#include "constants.h"
 #include "lowpassfilterfactory.h"
 #include "chromatransformfactory.h"
 #include "spectrumanalyser.h"
 #include "keyclassifier.h"
 
 namespace KeyFinder {
 
-  class KEYFINDER_DECLSPEC KeyFinder {
+  class KeyFinder {
   public:
 
     // for progressive analysis

diff --git a/src/lowpassfilter.h b/src/lowpassfilter.h
@@ -30,7 +30,7 @@ namespace KeyFinder {
 
   class LowPassFilterPrivate;
 
-  class KEYFINDER_DECLSPEC LowPassFilter {
+  class LowPassFilter {
   public:
     LowPassFilter(unsigned int order, unsigned int frameRate, double cornerFrequency, unsigned int fftFrameSize);
     ~LowPassFilter();

diff --git a/src/lowpassfilterfactory.h b/src/lowpassfilterfactory.h
@@ -27,7 +27,7 @@
 
 namespace KeyFinder {
 
-  class KEYFINDER_DECLSPEC LowPassFilterFactory {
+  class LowPassFilterFactory {
   public:
     LowPassFilterFactory();
     ~LowPassFilterFactory();
@@ -38,7 +38,7 @@ namespace KeyFinder {
     std::mutex lowPassFilterFactoryMutex;
   };
 
-  class KEYFINDER_DECLSPEC LowPassFilterFactory::LowPassFilterWrapper {
+  class LowPassFilterFactory::LowPassFilterWrapper {
   public:
     LowPassFilterWrapper(unsigned int order, unsigned int frameRate, double cornerFrequency, unsigned int fftFrameSize, const LowPassFilter* const filter);
     ~LowPassFilterWrapper();

diff --git a/src/spectrumanalyser.h b/src/spectrumanalyser.h
@@ -32,7 +32,7 @@
 
 namespace KeyFinder {
 
-  class KEYFINDER_DECLSPEC SpectrumAnalyser {
+  class SpectrumAnalyser {
   public:
     SpectrumAnalyser(unsigned int frameRate, ChromaTransformFactory* ctFactory, TemporalWindowFactory* twFactory);
     Chromagram* chromagramOfWholeFrames(AudioData& audio, FftAdapter* const fft) const;

diff --git a/src/temporalwindowfactory.h b/src/temporalwindowfactory.h
@@ -27,7 +27,7 @@
 
 namespace KeyFinder {
 
-  class KEYFINDER_DECLSPEC TemporalWindowFactory {
+  class TemporalWindowFactory {
   public:
     TemporalWindowFactory();
     ~TemporalWindowFactory();
@@ -38,7 +38,7 @@ namespace KeyFinder {
     std::mutex temporalWindowFactoryMutex;
   };
 
-  class KEYFINDER_DECLSPEC TemporalWindowFactory::TemporalWindowWrapper {
+  class TemporalWindowFactory::TemporalWindowWrapper {
   public:
     TemporalWindowWrapper(unsigned int frameSize);
     unsigned int getFrameSize() const;

diff --git a/src/toneprofiles.h b/src/toneprofiles.h
@@ -27,7 +27,7 @@
 
 namespace KeyFinder {
 
-  class KEYFINDER_DECLSPEC ToneProfile {
+  class ToneProfile {
   public:
     ToneProfile(const std::vector<double>& customProfile);
     ~ToneProfile();

diff --git a/src/windowfunctions.h b/src/windowfunctions.h
@@ -26,7 +26,7 @@
 
 namespace KeyFinder {
 
-  class KEYFINDER_DECLSPEC WindowFunction {
+  class WindowFunction {
   public:
     double window(temporal_window_t windowType, int sample, int width) const;
     double gaussianWindow(int sample, int width, double sigma) const;

diff --git a/src/workspace.h b/src/workspace.h
@@ -25,12 +25,11 @@
 #include "audiodata.h"
 #include "binode.h"
 #include "chromagram.h"
-#include "constants.h"
 #include "fftadapter.h"
 
 namespace KeyFinder {
 
-  class KEYFINDER_DECLSPEC Workspace {
+  class Workspace {
   public:
     Workspace();
     ~Workspace();