Merge branch 'master' into pu/mp

Origin commit data
------------------
Commit: 6be63f736c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)
This commit is contained in:
Jacek Jendrzej
2017-08-23 13:10:49 +02:00
15 changed files with 40 additions and 29 deletions

View File

@@ -644,7 +644,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
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;
int type = 0, layer = 0, freq = 0, mode = 0, lbitrate = 0;
/*
audioDecoder->getAudioInfo() seems broken in libcoolstream2.
ddmode is always 1 ("CH1/CH2").