fix: resolve merge conflicts

Author: Lunix-420

CMakeLists.txt

@@ -10,7 +10,7 @@ set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS TRUE) 
 set(EXT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external)
 
-# Set macOS deployment target for older macOS compatibility
+# Set macOS deployment target for older macO6S compatibility
 include(cmake/get_cpm.cmake)
 
 # Add external dependencies

src/dmt/app/AbstractPluginEditor.h

@@ -1,14 +1,11 @@
 #pragma once
 
-<<<<<<< HEAD
-=======
 //==============================================================================
 // Preprocessor flags for renderer control
 #define DMT_SUPPRESS_GL_DEBUG_MESSAGES 0
 
 //==============================================================================
 
->>>>>>> a5e5c670fddd956080480f24e1397fa5872f9993
 #include "app/AbstractPluginProcessor.h"
 #include "gui/window/Compositor.h"
 #include <JuceHeader.h>

src/dmt/configuration/Options.h

@@ -55,14 +55,6 @@ getOptions() noexcept
   options.filenameSuffix = ".config";
   options.storageFormat = juce::PropertiesFile::storeAsXML;
 
-<<<<<<< HEAD
-  if constexpr (OS_IS_WINDOWS) {
-    options.folderName = juce::String("Dimethoxy/") + name;
-  } else if constexpr (OS_IS_DARWIN) {
-    options.folderName = juce::String("Dimethoxy/") + name;
-  } else if constexpr (OS_IS_LINUX) {
-    options.folderName = juce::String(".config/Dimethoxy/") + name;
-=======
   if (OS_IS_WINDOWS) {
     options.folderName = juce::String("Dimethoxy/") + name;
   } else if (OS_IS_DARWIN) {
@@ -72,7 +64,6 @@ getOptions() noexcept
   } else {
     // What the hell is the OS?
     options.folderName = juce::String("Dimethoxy/") + name;
->>>>>>> a5e5c670fddd956080480f24e1397fa5872f9993
   }
 
   options.osxLibrarySubFolder = "Application Support";

src/dmt/dsp/effect/Effect.h

@@ -33,9 +33,6 @@
 #include "./Distortion.h"
 #include "./HeretikProcessor.h"
 #include "./LowpassProcessor.h"
-<<<<<<< HEAD
-=======
 #include "./NeutrinoProcessor.h"
->>>>>>> a5e5c670fddd956080480f24e1397fa5872f9993
 
 //==============================================================================

src/dmt/dsp/envelope/AdhEnvelope.h

@@ -50,30 +50,18 @@ class AhdEnvelope
 public:
   struct Parameters
   {
-<<<<<<< HEAD
-    float attack = 0.015f;
-    float hold = 0.08f;
-    float decay = 0.5f;
-
-    float attackSkew = 0;
-    float decaySkew = 10;
-=======
     bool enabled = true;
     float attack = 0.015f;
     float hold = 0.08f;
     float decay = 0.5f;
     float attackBend = 0;
     float decayBend = 0;
     float depth = 1.0f;
->>>>>>> a5e5c670fddd956080480f24e1397fa5872f9993
   };
 
   enum class State
   {
-<<<<<<< HEAD
-=======
     Disabled,
->>>>>>> a5e5c670fddd956080480f24e1397fa5872f9993
     Attack,
     Hold,
     Decay,
@@ -82,8 +70,6 @@ class AhdEnvelope
 
   constexpr AhdEnvelope() noexcept = default;
 
-<<<<<<< HEAD
-=======
   inline void setParameters(const juce::AudioProcessorValueTreeState& apvts,
                             juce::String prefix) noexcept
   {
@@ -98,7 +84,6 @@ class AhdEnvelope
     params.depth = apvts.getRawParameterValue(base + "Depth")->load();
   }
 
->>>>>>> a5e5c670fddd956080480f24e1397fa5872f9993
   /**
    * @brief Set the envelope parameters.
    * @param _newParams The new parameters to set.
@@ -109,16 +94,13 @@ class AhdEnvelope
   }
 
   /**
-<<<<<<< HEAD
-=======
    * @brief Get the Parameters object
    *
    * @return The current Parameters object
    */
   inline Parameters getParameters() const noexcept { return params; }
 
   /**
->>>>>>> a5e5c670fddd956080480f24e1397fa5872f9993
    * @brief Set the sample rate.
    * @param _newSampleRate The new sample rate to set.
    */
@@ -138,21 +120,13 @@ class AhdEnvelope
    */
   [[nodiscard]] inline State getState() const noexcept
   {
-<<<<<<< HEAD
-    if (sampleIndex < getHoldStart()) [[likely]]
-      return State::Attack;
-    if (sampleIndex < getDecayStart()) [[likely]]
-      return State::Hold;
-    if (sampleIndex < getDecayEnd()) [[likely]]
-=======
     if (!params.enabled)
       return State::Disabled;
     if (sampleIndex < getHoldStart())
       return State::Attack;
     if (sampleIndex < getDecayStart())
       return State::Hold;
     if (sampleIndex < getDecayEnd())
->>>>>>> a5e5c670fddd956080480f24e1397fa5872f9993
       return State::Decay;
     return State::Idle;
   }
@@ -181,58 +155,29 @@ class AhdEnvelope
     constexpr float zero = 0.0f;
 
     switch (_state) {
-<<<<<<< HEAD
-      case State::Attack: {
-        const float normalizedPosition =
-          static_cast<float>(sampleIndex) / sampleRate;
-        const float skew = getSkew(State::Attack);
-        return std::pow(normalizedPosition / params.attack, skew);
-=======
       case State::Disabled:
         return 0.0f;
       case State::Attack: {
         const float normalizedPosition =
           static_cast<float>(sampleIndex) / sampleRate;
         const float phaseProgress = normalizedPosition / params.attack;
         return applyAtanBend(phaseProgress, params.attackBend);
->>>>>>> a5e5c670fddd956080480f24e1397fa5872f9993
       }
       case State::Hold:
         return one;
       case State::Decay: {
         const float decayStart = static_cast<float>(getDecayStart());
         const float normalizedPosition =
           (static_cast<float>(sampleIndex) - decayStart) / sampleRate;
-<<<<<<< HEAD
-        const float skew = getSkew(State::Decay);
-        return one - std::pow(normalizedPosition / params.decay, skew);
-=======
         const float phaseProgress = normalizedPosition / params.decay;
         return one - applyAtanBend(phaseProgress, params.decayBend);
->>>>>>> a5e5c670fddd956080480f24e1397fa5872f9993
       }
       default:
         return zero;
     }
   }
 
   /**
-<<<<<<< HEAD
-   * @brief Get the skew value for the given state.
-   * @param _state The current state of the envelope.
-   * @return The skew value.
-   */
-  [[nodiscard]] inline float getSkew(const State _state) const noexcept
-  {
-    switch (_state) {
-      case State::Attack:
-        return dmt::math::linearToExponent(params.attackSkew);
-      case State::Decay:
-        return dmt::math::linearToExponent(-params.decaySkew);
-      default:
-        return 1.0f;
-    }
-=======
    * @brief Apply atan-based bend to normalized phase in range [0, 1].
    */
   [[nodiscard]] static inline float applyAtanBend(float normalizedPhase,
@@ -256,7 +201,6 @@ class AhdEnvelope
 
     // Negative bend
     return 1.0f - (atan(k * (1.0f - x)) / normalizer);
->>>>>>> a5e5c670fddd956080480f24e1397fa5872f9993
   }
 
   /**

src/dmt/dsp/synth/Synth.h

@@ -29,16 +29,9 @@
 
 //==============================================================================
 
-<<<<<<< HEAD
-#include "./AnalogOscillator.h"
-#include "./AnalogWaveform.h"
-#include "./SynthSound.h"
-#include "./SynthVoice.h"
-=======
 #include "./DigitalOscillator.h"
 #include "./DigitalWaveform.h"
 #include "./NeutrinoSynthVoice.h"
 #include "./SynthSound.h"
->>>>>>> a5e5c670fddd956080480f24e1397fa5872f9993
 
 //==============================================================================