Merge remote-tracking branch 'tuxbox/master'

Origin commit data
------------------
Commit: 48ff7b36a2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)
This commit is contained in:
Stefan Seyfried
2017-01-30 21:36:09 +01:00
23 changed files with 122 additions and 77 deletions

View File

@@ -615,12 +615,17 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
average_bitrate_pos = ypos += iheight;
//AUDIOTYPE
ypos += iheight;
int type, layer, freq, mode, lbitrate;
audioDecoder->getAudioInfo(type, layer, freq, lbitrate, mode);
snprintf(buf, sizeof(buf), "%s:", g_Locale->getText (LOCALE_STREAMINFO_AUDIOTYPE));
g_Font[font_info]->RenderString (xpos, ypos, box_width, buf, COL_MENUCONTENT_TEXT);
int type, layer, freq, mode, lbitrate;
/*
audioDecoder->getAudioInfo() seems broken in libcoolstream2.
ddmode is always 1 ("CH1/CH2").
*/
audioDecoder->getAudioInfo(type, layer, freq, lbitrate, mode);
if (type == AUDIO_FMT_MPEG)
{
const char *mpegmodes[] =