EscapeJSonArtistTitle

mixxxdj · Jan 21, 2025 · 802a84b · 802a84b
1 parent 05b0913
commit 802a84b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/src/engine/enginebuffer.cpp b/src/engine/enginebuffer.cpp
@@ -578,8 +578,8 @@ void EngineBuffer::slotTrackLoaded(TrackPointer pTrack,
     if (m_pConfig->getValue<bool>(ConfigKey("[OSC]", "OscEnabled"))) {
         sendTrackInfoToOscClients(m_pConfig,
                 getGroup(),
-                pTrack->getArtist().toLatin1(),
-                pTrack->getTitle().toLatin1(),
+                pTrack->getArtist(),
+                pTrack->getTitle(),
                 1,
                 (float)pTrack->getDuration(),
                 0);

diff --git a/src/osc/oscfunctions.h b/src/osc/oscfunctions.h
@@ -4,9 +4,11 @@
 constexpr int OUTPUT_BUFFER_SIZE = 1024;
 constexpr int IP_MTU_SIZE = 1536;
 
+#include <QChar>
 #include <QDataStream>
 #include <QFile>
 #include <QSharedPointer>
+#include <QString>
 #include <iostream>
 #include <memory>
 
@@ -22,6 +24,21 @@ enum class DefOscBodyType {
     FLOATBODY
 };
 
+// function to convert and carry special characters in TrackArtist & TrackTitle to ASCII
+QString escapeStringToJsonUnicode(const QString& input) {
+    QString escaped;
+    for (QChar c : input) {
+        if (c.isPrint() && c.unicode() < 128) {
+            // Keep printable ASCII characters as is
+            escaped += c;
+        } else {
+            // Escape non-ASCII and special characters
+            escaped += QString("\\u%1").arg(c.unicode(), 4, 16, QChar('0')).toUpper();
+        }
+    }
+    return escaped;
+}
+
 void sendOscMessage(const char* receiverIp,
         int port,
         osc::OutboundPacketStream& p,
@@ -166,15 +183,15 @@ void sendTrackInfoToOscClients(UserSettingsPointer pConfig,
             oscGroup,
             "TrackArtist",
             DefOscBodyType::STRINGBODY,
-            trackArtist,
+            escapeStringToJsonUnicode(trackArtist),
             0,
             0,
             0);
     oscFunctionsSendPtrType(pConfig,
             oscGroup,
             "TrackTitle",
             DefOscBodyType::STRINGBODY,
-            trackTitle,
+            escapeStringToJsonUnicode(trackTitle),
             0,
             0,
             0);