From b728b506141212567ccdeccc93f1fa4477d8816b Mon Sep 17 00:00:00 2001 From: Sanskar Bajpai Date: Mon, 24 Aug 2020 21:36:17 +0530 Subject: [PATCH 1/2] Stream_name: Adding a default stream name to the Stream Info. Previously, the default stream name was blank. To accomodate consistency, this commit will add 'Mixxx' to the stream name. --- src/preferences/broadcastprofile.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/preferences/broadcastprofile.cpp b/src/preferences/broadcastprofile.cpp index 2b5dc955666..15da657f89a 100644 --- a/src/preferences/broadcastprofile.cpp +++ b/src/preferences/broadcastprofile.cpp @@ -74,6 +74,8 @@ const bool kDefaultNoDelayFirstReconnect = true; const bool kDefaultOggDynamicupdate = false; double kDefaultReconnectFirstDelay = 0.0; double kDefaultReconnectPeriod = 5.0; +const QString kDefaultStreamName = + QObject::tr("Mixxx"); const QString kDefaultStreamDesc = QObject::tr("This stream is online for testing purposes!"); const QString kDefaultStreamGenre = QObject::tr("Live Mix"); @@ -231,7 +233,7 @@ void BroadcastProfile::adoptDefaultValues() { m_mountpoint = QString(); m_streamDesc = kDefaultStreamDesc; m_streamGenre = kDefaultStreamGenre; - m_streamName = QString(); + m_streamName = kDefaultStreamName; m_streamPublic = kDefaultStreamPublic; m_streamWebsite = MIXXX_WEBSITE_URL; m_streamIRC.clear(); From 3a86b208bc3375e68b09a8d0234e7758ffea24aa Mon Sep 17 00:00:00 2001 From: Sanskar Bajpai Date: Tue, 25 Aug 2020 11:08:24 +0530 Subject: [PATCH 2/2] Stream_name: Replaced QString with QStringLiteral. This commit makes it such that, The kDefaultStreamName need not be translated. Co-authored-by: ronso0 --- src/preferences/broadcastprofile.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/preferences/broadcastprofile.cpp b/src/preferences/broadcastprofile.cpp index 15da657f89a..118d52f0968 100644 --- a/src/preferences/broadcastprofile.cpp +++ b/src/preferences/broadcastprofile.cpp @@ -74,8 +74,7 @@ const bool kDefaultNoDelayFirstReconnect = true; const bool kDefaultOggDynamicupdate = false; double kDefaultReconnectFirstDelay = 0.0; double kDefaultReconnectPeriod = 5.0; -const QString kDefaultStreamName = - QObject::tr("Mixxx"); +const QString kDefaultStreamName = QStringLiteral("Mixxx"); const QString kDefaultStreamDesc = QObject::tr("This stream is online for testing purposes!"); const QString kDefaultStreamGenre = QObject::tr("Live Mix");