Osc in Mixxx + ARM64/2.6 (20241104)

CMakeLists.txt

@@ -1368,6 +1368,8 @@ add_library(
   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
@@ -3156,6 +3158,43 @@ target_include_directories(
 )
 target_link_libraries(mixxx-lib PRIVATE rekordbox_metadata)
 
+if(WIN32)
+  set(IpSystemTypePath src/osc/ip/win32)
+  set(LIBS ${LIBS} Ws2_32 winmm)
+else()
+  set(IpSystemTypePath src/osc/ip/posix)
+endif()
+
+#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)

res/linux/org.mixxx.Mixxx.desktop

@@ -10,12 +10,12 @@ GenericName[es]=Sistema DJ digital
 GenericName[cz]=Digitální DJ systém
 GenericName[ru]=Цифровая диджейская система
 GenericName[uk]=Цифрова діджейська система
-GenericName[sl]=Digitalni DJ sistem
+GenericName[sl]=Digitalni DJ system
 GenericName[pl]=Cyfrowy system DJ-ski
 GenericName[zh]=数字 DJ 系统
 GenericName[sv]=Digitalt DJ-system
 GenericName[pt]=Sistema de DJ digital
-GenericName[ro]=Sistem DJ digital
+GenericName[ro]=System DJ digital
 GenericName[ja]=デジタルDJシステム
 GenericName[hu]=Digitális DJ rendszer
 GenericName[tr]=Dijital DJ sistemi
@@ -33,12 +33,12 @@ Comment[es]=Un sistema de DJ digital
 Comment[cz]=Digitální DJ systém
 Comment[ru]=Цифровая диджейская система
 Comment[uk]=Цифрова діджейська система
-Comment[sl]=Digitalni DJ sistem
+Comment[sl]=Digitalni DJ system
 Comment[pl]=Cyfrowy system DJ-ski
 Comment[zh]=数字 DJ 系统
 Comment[sv]=Ett digitalt DJ-system
 Comment[pt]=Um sistema de DJ digital
-Comment[ro]=Un sistem DJ digital
+Comment[ro]=Un system DJ digital
 Comment[ja]=デジタルDJシステム
 Comment[hu]=Digitális DJ rendszer
 Comment[tr]=Dijital bir DJ sistemi

src/engine/enginebuffer.cpp

@@ -54,6 +54,17 @@ const QString kAppGroup = QStringLiteral("[App]");
 
 } // anonymous namespace
 
+// EveOSC
+void sendTrackInfoToOscClients(UserSettingsPointer pConfig,
+        const QString& oscGroup,
+        const QString& trackArtist,
+        const QString& trackTitle,
+        float track_loaded,
+        float duration,
+        float playposition);
+void sendNoTrackLoadedToOscClients(UserSettingsPointer pConfig, const QString& oscGroup);
+// EveOSC
+
 EngineBuffer::EngineBuffer(const QString& group,
         UserSettingsPointer pConfig,
         EngineChannel* pChannel,
@@ -563,6 +574,18 @@ void EngineBuffer::slotTrackLoaded(TrackPointer pTrack,
     m_pTrackSampleRate->set(trackSampleRate.toDouble());
     m_pTrackLoaded->forceSet(1);
 
+    //  EveOSC begin
+    if (m_pConfig->getValue<bool>(ConfigKey("[OSC]", "OscEnabled"))) {
+        sendTrackInfoToOscClients(m_pConfig,
+                getGroup(),
+                pTrack->getArtist(),
+                pTrack->getTitle(),
+                1,
+                (float)pTrack->getDuration(),
+                0);
+    }
+    // EveOSC end
+
     // Reset slip mode
     m_pSlipButton->set(0);
     m_bSlipEnabledProcessing = false;
@@ -632,6 +655,12 @@ void EngineBuffer::ejectTrack() {
     m_pTrackSampleRate->set(0);
     m_pTrackLoaded->forceSet(0);
 
+    //  EveOSC begin
+    if (m_pConfig->getValue<bool>(ConfigKey("[OSC]", "OscEnabled"))) {
+        sendNoTrackLoadedToOscClients(m_pConfig, getGroup());
+    }
+    //  EveOSC end
+
     m_playButton->set(0.0);
     m_playposSlider->set(0);
     m_pCueControl->resetIndicators();

src/mixer/basetrackplayer.cpp

@@ -32,6 +32,12 @@ inline double trackColorToDouble(mixxx::RgbColor::optional_t color) {
 }
 } // namespace
 
+// EveOSC
+void oscChangedPlayState(UserSettingsPointer m_pConfig,
+        const QString& OscGroup,
+        float playstate);
+// EveOSC
+
 BaseTrackPlayer::BaseTrackPlayer(PlayerManager* pParent, const QString& group)
         : BasePlayer(pParent, group) {
 }
@@ -952,6 +958,11 @@ void BaseTrackPlayerImpl::slotPlayToggled(double value) {
     if (value == 0 && m_replaygainPending) {
         setReplayGain(m_pLoadedTrack->getReplayGain().getRatio());
     }
+    //  EveOSC begin
+    if (m_pConfig->getValue<bool>(ConfigKey("[OSC]", "OscEnabled"))) {
+        oscChangedPlayState(m_pConfig, getGroup(), (float)value);
+    }
+    // EveOSC endc
 }
 
 EngineDeck* BaseTrackPlayerImpl::getEngineDeck() const {

src/mixxxmainwindow.cpp

@@ -65,6 +65,11 @@
 #include "vinylcontrol/vinylcontrolmanager.h"
 #endif
 
+//  EveOSC
+#include "osc/oscfunctions.h"
+#include "osc/oscreceiver.cpp"
+//  EveOSC
+
 namespace {
 #ifdef __LINUX__
 // Detect if the desktop supports a global menu to decide whether we need to rebuild
@@ -142,6 +147,9 @@ MixxxMainWindow::MixxxMainWindow(std::shared_ptr<mixxx::CoreServices> pCoreServi
 
     m_pGuiTick = new GuiTick();
     m_pVisualsManager = new VisualsManager();
+    // EveOSC
+    oscEnable();
+    // EveOSC
 }
 
 #ifdef MIXXX_USE_QOPENGL
@@ -1498,3 +1506,13 @@ void MixxxMainWindow::initializationProgressUpdate(int progress, const QString&
     }
     qApp->processEvents();
 }
+
+void MixxxMainWindow::oscEnable() {
+    UserSettingsPointer pConfig;
+    if (m_pCoreServices->getSettings()->getValue<bool>(ConfigKey("[OSC]", "OscEnabled"))) {
+        qDebug() << "Mixxx OSC Service Enabled";
+        oscReceiverMain(m_pCoreServices->getSettings());
+    } else {
+        qDebug() << "Mixxx OSC Service NOT Enabled";
+    }
+}

src/mixxxmainwindow.h

@@ -107,6 +107,9 @@ class MixxxMainWindow : public QMainWindow {
   private:
     void initializeWindow();
     void checkDirectRendering();
+    // EveOSC
+    void oscEnable();
+    // EveOSC
 
     /// Load skin to a QWidget that we set as the central widget.
     bool loadConfiguredSkin();

src/osc/ip/IpEndpointName.cpp

@@ -0,0 +1,110 @@
+/*
+        oscpack -- Open Sound Control (OSC) packet manipulation library
+    http://www.rossbencina.com/code/oscpack
+
+    Copyright (c) 2004-2013 Ross Bencina <rossb@audiomulch.com>
+
+        Permission is hereby granted, free of charge, to any person obtaining
+        a copy of this software and associated documentation files
+        (the "Software"), to deal in the Software without restriction,
+        including without limitation the rights to use, copy, modify, merge,
+        publish, distribute, sublicense, and/or sell copies of the Software,
+        and to permit persons to whom the Software is furnished to do so,
+        subject to the following conditions:
+
+        The above copyright notice and this permission notice shall be
+        included in all copies or substantial portions of the Software.
+
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+        EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+        MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+        IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+        ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+        CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+        WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+/*
+        The text above constitutes the entire oscpack license; however,
+        the oscpack developer(s) also make the following non-binding requests:
+
+        Any person wishing to distribute modifications to the Software is
+        requested to send the modifications to the original developer so that
+        they can be incorporated into the canonical version. It is also
+        requested that these non-binding requests be included whenever the
+        above license is reproduced.
+*/
+#include "IpEndpointName.h"
+
+#include <cstdio>
+
+#include "NetworkingUtils.h"
+
+unsigned long IpEndpointName::GetHostByName(const char* s) {
+    return ::GetHostByName(s);
+}
+
+void IpEndpointName::AddressAsString(char* s) const {
+    if (address == ANY_ADDRESS) {
+        // std::sprintf(s, "<any>");
+        std::snprintf(s, 16, "<any>");
+    } else {
+        // std::sprintf(s,
+        //        "%d.%d.%d.%d",
+        //        (int)((address >> 24) & 0xFF),
+        //        (int)((address >> 16) & 0xFF),
+        //        (int)((address >> 8) & 0xFF),
+        //        (int)(address & 0xFF));
+        std::snprintf(s,
+                16,
+                "%d.%d.%d.%d",
+                (int)((address >> 24) & 0xFF),
+                (int)((address >> 16) & 0xFF),
+                (int)((address >> 8) & 0xFF),
+                (int)(address & 0xFF));
+    }
+}
+
+void IpEndpointName::AddressAndPortAsString(char* s) const {
+    if (port == ANY_PORT) {
+        if (address == ANY_ADDRESS) {
+            // std::sprintf(s, "<any>:<any>");
+            std::snprintf(s, 16, "<any>:<any>");
+        } else {
+            // std::sprintf(s,
+            //        "%d.%d.%d.%d:<any>",
+            //        (int)((address >> 24) & 0xFF),
+            //        (int)((address >> 16) & 0xFF),
+            //        (int)((address >> 8) & 0xFF),
+            //        (int)(address & 0xFF));
+            std::snprintf(s,
+                    16,
+                    "%d.%d.%d.%d:<any>",
+                    (int)((address >> 24) & 0xFF),
+                    (int)((address >> 16) & 0xFF),
+                    (int)((address >> 8) & 0xFF),
+                    (int)(address & 0xFF));
+        }
+    } else {
+        if (address == ANY_ADDRESS) {
+            // std::sprintf(s, "<any>:%d", port);
+            std::snprintf(s, 16, "<any>:%d", port);
+        } else {
+            // std::sprintf(s,
+            //        "%d.%d.%d.%d:%d",
+            //        (int)((address >> 24) & 0xFF),
+            //        (int)((address >> 16) & 0xFF),
+            //        (int)((address >> 8) & 0xFF),
+            //        (int)(address & 0xFF),
+            //        (int)port);
+            std::snprintf(s,
+                    16,
+                    "%d.%d.%d.%d:%d",
+                    (int)((address >> 24) & 0xFF),
+                    (int)((address >> 16) & 0xFF),
+                    (int)((address >> 8) & 0xFF),
+                    (int)(address & 0xFF),
+                    (int)port);
+        }
+    }
+}