Merge to build20241015

CMakeLists.txt

@@ -1066,6 +1066,8 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/preferences/dialog/dlgpreflibrarydlg.ui
   src/preferences/dialog/dlgprefmixer.cpp
   src/preferences/dialog/dlgprefmixerdlg.ui
+  src/preferences/dialog/dlgprefosc.cpp
+  src/preferences/dialog/dlgprefoscdlg.ui
   src/preferences/dialog/dlgprefrecord.cpp
   src/preferences/dialog/dlgprefrecorddlg.ui
   src/preferences/dialog/dlgprefreplaygain.cpp
@@ -2558,6 +2560,42 @@ add_library(rekordbox_metadata STATIC EXCLUDE_FROM_ALL
 target_include_directories(rekordbox_metadata SYSTEM PUBLIC lib/rekordbox-metadata)
 target_link_libraries(mixxx-lib PRIVATE rekordbox_metadata)
 
+IF(WIN32)
+	 set(IpSystemTypePath src/osc/ip/win32)
+	 set(LIBS ${LIBS} Ws2_32 winmm)
+	ELSE(WIN32)
+	 set(IpSystemTypePath src/osc/ip/posix)
+	ENDIF(WIN32)
+
+#eve osc
+ADD_LIBRARY(oscpack
+	src/osc/ip/IpEndpointName.cpp
+    src/osc/ip/IpEndpointName.h
+	src/osc/ip/NetworkingUtils.h
+	${IpSystemTypePath}/NetworkingUtils.cpp
+	src/osc/ip/PacketListener.h
+    src/osc/ip/TimerListener.h
+    src/osc/ip/UdpSocket.h
+	${IpSystemTypePath}/UdpSocket.cpp
+	src/osc/osc/MessageMappingOscPacketListener.h
+    src/osc/osc/OscException.h
+    src/osc/osc/OscHostEndianness.h
+    src/osc/osc/OscOutboundPacketStream.cpp
+    src/osc/osc/OscOutboundPacketStream.h
+    src/osc/osc/OscPacketListener.h
+    src/osc/osc/OscPrintReceivedElements.cpp
+    src/osc/osc/OscPrintReceivedElements.h
+    src/osc/osc/OscReceivedElements.cpp
+	src/osc/osc/OscReceivedElements.h
+	src/osc/osc/OscTypes.cpp
+	src/osc/osc/OscTypes.h
+	)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
+#target_link_libraries(mixxx oscpack ${LIBS})
+target_include_directories(mixxx-lib SYSTEM PRIVATE ip)
+target_include_directories(mixxx-lib SYSTEM PRIVATE osc)
+target_link_libraries(mixxx-lib PRIVATE oscpack)
+
 #silence "enumeration values not handled in switch" in generated code
 if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
     target_compile_options(rekordbox_metadata PRIVATE -Wno-switch)

src/engine/controls/cuecontrol.cpp

@@ -108,8 +108,10 @@
     m_pTrackSamples = ControlObject::getControl(ConfigKey(group, "track_samples"));
 
     m_pQuantizeEnabled = ControlObject::getControl(ConfigKey(group, "quantize"));
-    connect(m_pQuantizeEnabled, &ControlObject::valueChanged,
-            this, &CueControl::quantizeChanged,
+    connect(m_pQuantizeEnabled,
+            &ControlObject::valueChanged,
+            this,
+            &CueControl::quantizeChanged,
             Qt::DirectConnection);
 
     m_pClosestBeat = ControlObject::getControl(ConfigKey(group, "beat_closest"));
@@ -341,8 +343,10 @@
 
     // Hotcue controls
     for (const auto& pControl : std::as_const(m_hotcueControls)) {
-        connect(pControl, &HotcueControl::hotcuePositionChanged,
-                this, &CueControl::hotcuePositionChanged,
+        connect(pControl,
+                &HotcueControl::hotcuePositionChanged,
+                this,
+                &CueControl::hotcuePositionChanged,
                 Qt::DirectConnection);
         connect(pControl,
                 &HotcueControl::hotcueEndPositionChanged,
@@ -607,8 +611,8 @@
 }
 
 void CueControl::cueUpdated() {
-    //auto lock = lockMutex(&m_mutex);
-    // We should get a trackCuesUpdated call anyway, so do nothing.
+    // auto lock = lockMutex(&m_mutex);
+    //  We should get a trackCuesUpdated call anyway, so do nothing.
 }
 
 void CueControl::loadCuesFromTrack() {
@@ -839,7 +843,7 @@
 };
 
 void CueControl::hotcueSet(HotcueControl* pControl, double value, HotcueSetMode mode) {
-    //qDebug() << "CueControl::hotcueSet" << value;
+    // qDebug() << "CueControl::hotcueSet" << value;
 
     if (value <= 0) {
         return;
@@ -859,6 +863,10 @@
     mixxx::audio::FramePos cueStartPosition;
     mixxx::audio::FramePos cueEndPosition;
     mixxx::CueType cueType = mixxx::CueType::Invalid;
+    double pass2CueCreationStem1Vol;
+    double pass2CueCreationStem2Vol;
+    double pass2CueCreationStem3Vol;
+    double pass2CueCreationStem4Vol;
 
     bool loopEnabled = m_pLoopEnabled->toBool();
     if (mode == HotcueSetMode::Auto) {
@@ -882,6 +890,42 @@
             mode = HotcueSetMode::Cue;
         }
     }
+    // EveCue-Loop
+    PollingControlProxy proxyStem(getGroup(), "stem_count", ControlFlag::AllowMissingOrInvalid);
+    if (proxyStem.get() > 1) {
+        const QString groupBaseName = getGroup().remove("[").remove("]");
+        const QString stemGroups[] = {
+                QString("[%1Stem1]").arg(groupBaseName),
+                QString("[%1Stem2]").arg(groupBaseName),
+                QString("[%1Stem3]").arg(groupBaseName),
+                QString("[%1Stem4]").arg(groupBaseName),
+        };
+
+        // get the mute multiplier
+        auto getMuteMultiplier = [](const QString& group) -> int {
+            PollingControlProxy proxyMute(group, "mute", ControlFlag::AllowMissingOrInvalid);
+            return static_cast<bool>(proxyMute.get()) ? -1 : 1;
+        };
+
+        // get the volume value adjusted by the mute multiplier
+        auto getVolume = [](const QString& group, int muteMultiplier) -> double {
+            PollingControlProxy proxyVolume(group, "volume", ControlFlag::AllowMissingOrInvalid);
+            return static_cast<double>(proxyVolume.get()) * muteMultiplier;
+        };
+
+        // calc stem volume values
+        pass2CueCreationStem1Vol = getVolume(stemGroups[0], getMuteMultiplier(stemGroups[0]));
+        pass2CueCreationStem2Vol = getVolume(stemGroups[1], getMuteMultiplier(stemGroups[1]));
+        pass2CueCreationStem3Vol = getVolume(stemGroups[2], getMuteMultiplier(stemGroups[2]));
+        pass2CueCreationStem4Vol = getVolume(stemGroups[3], getMuteMultiplier(stemGroups[3]));
+
+    } else {
+        pass2CueCreationStem1Vol = 1.0;
+        pass2CueCreationStem2Vol = 1.0;
+        pass2CueCreationStem3Vol = 1.0;
+        pass2CueCreationStem4Vol = 1.0;
+    }
+    // EveCue-Loop
 
     switch (mode) {
     case HotcueSetMode::Cue: {
@@ -954,7 +998,11 @@
             hotcueIndex,
             cueStartPosition,
             cueEndPosition,
-            color);
+            color,
+            pass2CueCreationStem1Vol,
+            pass2CueCreationStem2Vol,
+            pass2CueCreationStem3Vol,
+            pass2CueCreationStem4Vol);
 
     // TODO(XXX) deal with spurious signals
     attachCue(pCue, pControl);
@@ -1108,20 +1156,52 @@
 }
 
 void CueControl::hotcueActivate(HotcueControl* pControl, double value, HotcueSetMode mode) {
-    //qDebug() << "CueControl::hotcueActivate" << value;
+    // qDebug() << "CueControl::hotcueActivate" << value;
 
     CuePointer pCue = pControl->getCue();
     if (value > 0) {
         // pressed
         if (pCue && pCue->getPosition().isValid() &&
                 pCue->getType() != mixxx::CueType::Invalid) {
+            // EveCue-Loop
+            PollingControlProxy proxyStem(getGroup(),
+                    "stem_count",
+                    ControlFlag::AllowMissingOrInvalid);
+            if (proxyStem.get() > 1) {
+                const QString groupBaseName = getGroup().remove('[').remove(']');
+                const std::vector<QString> stemGroups = {
+                        QString("[%1Stem1]").arg(groupBaseName),
+                        QString("[%1Stem2]").arg(groupBaseName),
+                        QString("[%1Stem3]").arg(groupBaseName),
+                        QString("[%1Stem4]").arg(groupBaseName)};
+
+                auto setMuteAndVolume = [](const QString& group,
+                                                double volume) {
+                    PollingControlProxy proxyMute(
+                            group, "mute", ControlFlag::AllowMissingOrInvalid);
+                    proxyMute.set(volume < 0 ? 1 : 0);
+                    PollingControlProxy proxyVolume(group,
+                            "volume",
+                            ControlFlag::AllowMissingOrInvalid);
+                    proxyVolume.set(std::abs(volume));
+                };
+
+                setMuteAndVolume(stemGroups[0], pCue->getStem1vol());
+                setMuteAndVolume(stemGroups[1], pCue->getStem2vol());
+                setMuteAndVolume(stemGroups[2], pCue->getStem3vol());
+                setMuteAndVolume(stemGroups[3], pCue->getStem4vol());
+            }
+            // EveCue-Loop
             if (m_pPlay->toBool() && m_currentlyPreviewingIndex == Cue::kNoHotCue) {
                 // playing by Play button
+
                 switch (pCue->getType()) {
                 case mixxx::CueType::HotCue:
+
                     hotcueGoto(pControl, value);
                     break;
                 case mixxx::CueType::Loop:
+
                     if (m_pCurrentSavedLoopControl != pControl) {
                         setCurrentSavedLoopControlAndActivate(pControl);
                     } else {
@@ -1575,15 +1655,15 @@
 
 void CueControl::pause(double v) {
     auto lock = lockMutex(&m_trackMutex);
-    //qDebug() << "CueControl::pause()" << v;
+    // qDebug() << "CueControl::pause()" << v;
     if (v > 0.0) {
         m_pPlay->set(0.0);
     }
 }
 
 void CueControl::playStutter(double v) {
     auto lock = lockMutex(&m_trackMutex);
-    //qDebug() << "playStutter" << v;
+    // qDebug() << "playStutter" << v;
     if (v > 0.0) {
         if (m_pPlay->toBool()) {
             if (m_currentlyPreviewingIndex != Cue::kNoHotCue) {
@@ -2011,8 +2091,8 @@
 // This is also called from the engine thread. No locking allowed.
 bool CueControl::updateIndicatorsAndModifyPlay(
         bool newPlay, bool oldPlay, bool playPossible) {
-    //qDebug() << "updateIndicatorsAndModifyPlay" << newPlay << playPossible
-    //        << m_iCurrentlyPreviewingHotcues << m_bPreviewing;
+    // qDebug() << "updateIndicatorsAndModifyPlay" << newPlay << playPossible
+    //         << m_iCurrentlyPreviewingHotcues << m_bPreviewing;
     CueMode cueMode = static_cast<CueMode>(static_cast<int>(m_pCueMode->get()));
     if ((cueMode == CueMode::Denon || cueMode == CueMode::Numark) &&
             newPlay && !oldPlay && playPossible &&
@@ -2726,6 +2806,19 @@
     m_hotcueType->forceSet(static_cast<double>(type));
 }
 
+void HotcueControl::setStem1vol(double stem1vol) {
+    m_hotcueStem1vol->set(static_cast<double>(stem1vol));
+}
+void HotcueControl::setStem2vol(double stem2vol) {
+    m_hotcueStem2vol->set(static_cast<double>(stem2vol));
+}
+void HotcueControl::setStem3vol(double stem3vol) {
+    m_hotcueStem3vol->set(static_cast<double>(stem3vol));
+}
+void HotcueControl::setStem4vol(double stem4vol) {
+    m_hotcueStem4vol->set(static_cast<double>(stem4vol));
+}
+
 void HotcueControl::setStatus(HotcueControl::Status status) {
     m_pHotcueStatus->forceSet(static_cast<double>(status));
 }

src/engine/controls/cuecontrol.h

@@ -99,6 +99,11 @@ class HotcueControl : public QObject {
     void setColor(mixxx::RgbColor::optional_t newColor);
     mixxx::RgbColor::optional_t getColor() const;
 
+    void setStem1vol(double stem1vol);
+    void setStem2vol(double stem2vol);
+    void setStem3vol(double stem3vol);
+    void setStem4vol(double stem4vol);
+
     /// Used for caching the preview state of this hotcue control
     /// for the case the cue is deleted during preview.
     mixxx::CueType getPreviewingType() const {