mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 00:11:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

Browse Source 
Conflicts:
	data/locale/english.locale
	data/pictures/backgrounds/1280x720/shutdown.jpg
	src/Makefile.am
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Commit: 40e46a0df3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
This commit is contained in:
vanhofen
2017-03-15 23:45:02 +01:00
parent aa7d4ff017 317bac3394
commit 85fab3c019
10 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/streaminfo2.cpp
View File

@@ -660,7 +660,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
*/
audioDecoder->getAudioInfo(type, layer, freq, lbitrate, mode);
if (type == AUDIO_FMT_MPEG)
if (type == AUDIO_FMT_MPEG || type == AUDIO_FMT_MP3)
{
const char *mpegmodes[] =
{
@@ -670,7 +670,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
"single_ch"
};
int max_mode = sizeof(mpegmodes) / sizeof(mpegmodes[0]);
snprintf(buf, sizeof(buf), "MPEG %s (%d)",
snprintf(buf, sizeof(buf), "%s %s (%d)",type == AUDIO_FMT_MPEG ? "MPEG":"MP3",
(mode > max_mode) ? "unk" : mpegmodes[mode],
freq);
}