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 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 3c35e98212
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-25 (Fri, 25 Aug 2017)
This commit is contained in:
vanhofen
2017-08-25 14:15:22 +02:00
parent 3188fd3a3c 7c35266afe
commit 7c75ab360f
40 changed files with 225 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/streaminfo2.cpp
View File

@@ -678,7 +678,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").