summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosepMaJAZ <josepma@gmail.com>2020-04-28 11:50:29 +0200
committerJosepMaJAZ <josepma@gmail.com>2020-04-28 11:50:29 +0200
commitfea06f1d22ccf81c38d8db76e0294f82581d9a58 (patch)
tree409b28ccfdcceaed529e70f8aacedc733151f9ac
parentf68a09a34714865a8dbc5396d0ece4abacf2c5a7 (diff)
Forgot to do a clean build and the compiler didn't detect that I had to change two more classes.
-rw-r--r--src/engine/sidechain/shoutconnection.cpp6
-rw-r--r--src/preferences/dialog/dlgprefbroadcast.cpp7
2 files changed, 7 insertions, 6 deletions
diff --git a/src/engine/sidechain/shoutconnection.cpp b/src/engine/sidechain/shoutconnection.cpp
index 4267915777..711c9fd48f 100644
--- a/src/engine/sidechain/shoutconnection.cpp
+++ b/src/engine/sidechain/shoutconnection.cpp
@@ -362,9 +362,9 @@ void ShoutConnection::updateFromPreferences() {
return;
}
- m_format_is_mp3 = !qstrcmp(baFormat.constData(), BROADCAST_FORMAT_MP3);
- m_format_is_ov = !qstrcmp(baFormat.constData(), BROADCAST_FORMAT_OV);
- m_format_is_opus = !qstrcmp(baFormat.constData(), BROADCAST_FORMAT_OPUS);
+ m_format_is_mp3 = !qstrcmp(baFormat.constData(), ENCODING_MP3);
+ m_format_is_ov = !qstrcmp(baFormat.constData(), ENCODING_OGG);
+ m_format_is_opus = !qstrcmp(baFormat.constData(), ENCODING_OPUS);
if (m_format_is_mp3) {
format = SHOUT_FORMAT_MP3;
} else if (m_format_is_ov || m_format_is_opus) {
diff --git a/src/preferences/dialog/dlgprefbroadcast.cpp b/src/preferences/dialog/dlgprefbroadcast.cpp
index df96741434..401252c64a 100644
--- a/src/preferences/dialog/dlgprefbroadcast.cpp
+++ b/src/preferences/dialog/dlgprefbroadcast.cpp
@@ -17,6 +17,7 @@
#endif
#include "broadcast/defs_broadcast.h"
+#include "recording/defs_recording.h"
#include "control/controlproxy.h"
#include "defs_urls.h"
#include "preferences/dialog/dlgprefbroadcast.h"
@@ -117,10 +118,10 @@ DlgPrefBroadcast::DlgPrefBroadcast(QWidget *parent,
}
// Encoding format combobox
- comboBoxEncodingFormat->addItem(tr("MP3"), BROADCAST_FORMAT_MP3);
- comboBoxEncodingFormat->addItem(tr("Ogg Vorbis"), BROADCAST_FORMAT_OV);
+ comboBoxEncodingFormat->addItem(tr("MP3"), ENCODING_MP3);
+ comboBoxEncodingFormat->addItem(tr("Ogg Vorbis"), ENCODING_OGG);
#ifdef __OPUS__
- comboBoxEncodingFormat->addItem(tr("Opus"), BROADCAST_FORMAT_OPUS);
+ comboBoxEncodingFormat->addItem(tr("Opus"), ENCODING_OPUS);
#endif
// Encoding channels combobox