Remove Unused Code and Legacy Element Modules

REUSE.toml

@@ -5,11 +5,6 @@ path = [ "src/lua/src/*.*", "src/lua/src/Makefile" ]
 SPDX-FileCopyrightText = "Copyright (C) 1994-2020 Lua.org, PUC-Rio."
 SPDX-License-Identifier = "MIT"
 
-[[annotations]]
-path = [ "src/dlfcn*.*" ]
-SPDX-FileCopyrightText = "Copyright (c) 2007 Ramiro Polla"
-SPDX-License-Identifier = "MIT"
-
 [[annotations]]
 path = "data/fonts/Roboto-Regular.ttf"
 SPDX-FileCopyrightText = "Copyright 2011 Google Inc."

include/element/arc.hpp

@@ -5,6 +5,7 @@
 
 #include <cstdint>
 
+#include <element/element.h>
 #include <element/juce/core.hpp>
 
 namespace element {
@@ -39,7 +40,7 @@ struct JUCE_API Arc {
     JUCE_LEAK_DETECTOR (Arc)
 };
 
-struct ArcSorter {
+struct EL_API ArcSorter {
     static inline int compareElements (const Arc* const first, const Arc* const second) noexcept
     {
         if (first->sourceNode < second->sourceNode)
@@ -65,7 +66,7 @@ struct ArcSorter {
 
 /** Holds a fast lookup table for checking which arcs are inputs to others. */
 template <class ArcType>
-class ArcTable {
+class EL_API ArcTable {
 public:
     explicit ArcTable (const juce::OwnedArray<ArcType>& arcs)
     {

include/element/audioengine.hpp

@@ -38,7 +38,7 @@ class AudioEngine final : public juce::ReferenceCountedObject {
                                         by a MidiInputDevice callback (don't use 
                                         except for debugging)
      */
-    void addMidiMessage (const MidiMessage msg, bool handleOnDeviceQueue = false);
+    void addMidiMessage (const juce::MidiMessage msg, bool handleOnDeviceQueue = false);
 
     void applySettings (Settings&);
 
@@ -58,22 +58,22 @@ class AudioEngine final : public juce::ReferenceCountedObject {
 
     void setPlaying (const bool shouldBePlaying);
     void setRecording (const bool shouldBeRecording);
-    void seekToAudioFrame (const int64 frame);
+    void seekToAudioFrame (const int64_t frame);
     void setMeter (int beatsPerBar, int beatDivisor);
 
     void togglePlayPause();
 
-    MidiKeyboardState& getKeyboardState();
+    juce::MidiKeyboardState& getKeyboardState();
     Transport::MonitorPtr getTransportMonitor() const;
-    AudioIODeviceCallback& getAudioIODeviceCallback();
-    MidiInputCallback& getMidiInputCallback();
+    juce::AudioIODeviceCallback& getAudioIODeviceCallback();
+    juce::MidiInputCallback& getMidiInputCallback();
 
     /** For use by external systems only! e.g. the AU/VST version of Element and
         possibly things like rendering in the future
      */
     void prepareExternalPlayback (const double sampleRate, const int blockSize, const int numIns, const int numOuts);
-    void processExternalBuffers (AudioBuffer<float>& buffer, MidiBuffer& midi);
-    void processExternalPlayhead (AudioPlayHead* playhead, const int nframes);
+    void processExternalBuffers (juce::AudioBuffer<float>& buffer, juce::MidiBuffer& midi);
+    void processExternalPlayhead (juce::AudioPlayHead* playhead, const int nframes);
     void releaseExternalResources();
     void updateExternalLatencySamples();
     int getExternalLatencySamples() const;
@@ -88,11 +88,11 @@ class AudioEngine final : public juce::ReferenceCountedObject {
     private:
         friend class AudioEngine;
 
-        Atomic<float> _level { 0 };
+        juce::Atomic<float> _level { 0 };
         void updateLevel (const float* const*, int numChannels, int numSamples) noexcept;
     };
 
-    using LevelMeterPtr = ReferenceCountedObjectPtr<LevelMeter>;
+    using LevelMeterPtr = juce::ReferenceCountedObjectPtr<LevelMeter>;
 
     LevelMeterPtr getLevelMeter (int channel, bool input);
     int getNumChannels (bool input) const noexcept;
@@ -104,6 +104,6 @@ class AudioEngine final : public juce::ReferenceCountedObject {
     RunMode runMode;
 };
 
-using AudioEnginePtr = ReferenceCountedObjectPtr<AudioEngine>;
+using AudioEnginePtr = juce::ReferenceCountedObjectPtr<AudioEngine>;
 
 } // namespace element

include/element/context.hpp

@@ -40,12 +40,6 @@ class Context {
 
     Settings& settings();
 
-    //=========================================================================
-    void openModule (const std::string& path);
-    void loadModules();
-    void addModulePath (const std::string& path);
-    void discoverModules();
-
 private:
     friend class Application;
     class Impl;

include/element/element.h

@@ -63,34 +63,6 @@ typedef enum {
 #define EL_MT_MIDI_PIPE       "el.MidiPipe"
 #define EL_MT_VECTOR          "el.Vector"
 
-//=============================================================================
-typedef void* elHandle;
-
-typedef struct elFeature {
-    const char* ID;
-    void* data;
-} elFeature;
-
-/** NULL terminated array of elFeature pointers */
-typedef const elFeature* const* elFeatures;
-#define EL_FEATURES_FOREACH(features, f) \
-    for (const elFeature* f = *features; f != NULL; f = *(++features))
-
-/** Descriptor for an Element module */
-typedef struct elDescriptor {
-    const char* ID;
-    elHandle (*create)();
-    const void* (*extension) (elHandle handle, const char* name);
-    void (*load) (elHandle handle, elFeatures features);
-    void (*unload) (elHandle handle);
-    void (*destroy) (elHandle handle);
-} elDescriptor;
-
-typedef const elDescriptor* (*elDescriptorFunction)();
-
-EL_PLUGIN_EXPORT
-const elDescriptor* element_descriptor();
-
 #ifdef __cplusplus
 } // extern "C"
 #endif

include/element/engine.hpp

@@ -45,17 +45,17 @@ class EngineService : public Service {
     Node addNode (const Node& node, const Node& target, const ConnectionBuilder&);
 
     /** Adds a plugin by description to the current graph */
-    Node addPlugin (const PluginDescription& desc, const bool verified = true, const float rx = 0.5f, const float ry = 0.5f, bool dontShowUI = false);
+    Node addPlugin (const juce::PluginDescription& desc, const bool verified = true, const float rx = 0.5f, const float ry = 0.5f, bool dontShowUI = false);
 
     /** Adds a plugin to a specific graph */
-    Node addPlugin (const Node& graph, const PluginDescription& desc);
+    Node addPlugin (const Node& graph, const juce::PluginDescription& desc);
 
     /** Adds a plugin to a specific graph and adds connections from
         a ConnectionBuilder */
-    Node addPlugin (const Node& graph, const PluginDescription& desc, const ConnectionBuilder& builder, const bool verified = true);
+    Node addPlugin (const Node& graph, const juce::PluginDescription& desc, const ConnectionBuilder& builder, const bool verified = true);
 
     /** Adds a midi device node to the current root graph */
-    Node addMidiDeviceNode (const MidiDeviceInfo& device, const bool isInput);
+    Node addMidiDeviceNode (const juce::MidiDeviceInfo& device, const bool isInput);
 
     /** Removes a node from the current graph */
     void removeNode (const uint32);
@@ -64,7 +64,7 @@ class EngineService : public Service {
     void removeNode (const Node& node);
 
     /** remove a node by Uuid */
-    void removeNode (const Uuid&);
+    void removeNode (const juce::Uuid&);
 
     /** Adds a new root graph */
     void addGraph();
@@ -123,9 +123,9 @@ class EngineService : public Service {
     void sessionReloaded();
 
     /** replace a node with a given plugin */
-    void replace (const Node&, const PluginDescription&);
+    void replace (const Node&, const juce::PluginDescription&);
 
-    void changeBusesLayout (const Node& node, const AudioProcessor::BusesLayout& layout);
+    void changeBusesLayout (const Node& node, const juce::AudioProcessor::BusesLayout& layout);
 
     Signal<void (const Node&)> sigNodeRemoved;
 
@@ -136,7 +136,7 @@ class EngineService : public Service {
     std::unique_ptr<RootGraphs> graphs;
 
     friend class ChangeBroadcaster;
-    Node addPlugin (GraphManager& controller, const PluginDescription& desc);
+    Node addPlugin (GraphManager& controller, const juce::PluginDescription& desc);
 };
 
 } // namespace element

include/element/juce.hpp

@@ -21,6 +21,6 @@
 #include <juce_gui_extra/juce_gui_extra.h>
 #include <juce_osc/juce_osc.h>
 
-using namespace juce; // FIXME:
+using namespace juce; // FIXME: namespace juce
 namespace element {
 }