diff options
| author | Stéphane L <contact@slepin.fr> | 2019-01-17 09:25:40 +0100 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2021-01-08 23:51:53 +0100 |
| commit | 029b40539380119bcd80a28e53607b2530d1b548 (patch) | |
| tree | 8178e8b2dee2f374ecf5274921c4027a572f4c56 /src/engine/sidechain/shoutconnection.cpp | |
| parent | a1cc267f91826830ee4e1cab8318a44641e445e2 (diff) | |
fdk-aac encoder
Diffstat (limited to 'src/engine/sidechain/shoutconnection.cpp')
| -rw-r--r-- | src/engine/sidechain/shoutconnection.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/engine/sidechain/shoutconnection.cpp b/src/engine/sidechain/shoutconnection.cpp index 6f77a9fdf7..5e99b38e0f 100644 --- a/src/engine/sidechain/shoutconnection.cpp +++ b/src/engine/sidechain/shoutconnection.cpp @@ -61,6 +61,7 @@ ShoutConnection::ShoutConnection(BroadcastProfilePtr profile, m_format_is_mp3(false), m_format_is_ov(false), m_format_is_opus(false), + m_format_is_aac(false), m_protocol_is_icecast1(false), m_protocol_is_icecast2(false), m_protocol_is_shoutcast(false), @@ -191,6 +192,7 @@ void ShoutConnection::updateFromPreferences() { m_format_is_mp3 = false; m_format_is_ov = false; + m_format_is_aac = false; m_protocol_is_icecast1 = false; m_protocol_is_icecast2 = false; m_protocol_is_shoutcast = false; @@ -364,17 +366,27 @@ void ShoutConnection::updateFromPreferences() { 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); + m_format_is_aac = + (!qstrcmp(baFormat.constData(), ENCODING_AAC) || + !qstrcmp(baFormat.constData(), ENCODING_HEAAC) || + !qstrcmp(baFormat.constData(), ENCODING_HEAACV2)); if (m_format_is_mp3) { format = SHOUT_FORMAT_MP3; } else if (m_format_is_ov || m_format_is_opus) { format = SHOUT_FORMAT_OGG; +#ifdef SHOUT_FORMAT_AAC + } else if (m_format_is_aac) { + format = SHOUT_FORMAT_AAC; +#endif } else { - qWarning() << "Error: unknown format:" << baFormat.constData(); + errorDialog(tr("Unknown stream encoding format!"), + tr("Use a libshout version with %1 enabled") + .arg(baFormat.constData())); return; } if (shout_set_format(m_pShout, format) != SHOUTERR_SUCCESS) { - errorDialog("Error setting streaming format!", shout_get_error(m_pShout)); + errorDialog(tr("Error setting stream encoding format!"), shout_get_error(m_pShout)); return; } |