mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 00:11:08 +02:00
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
src/neutrino.cpp
Origin commit data
------------------
Commit: 470a8b62dd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-23 (Wed, 23 Aug 2017)
This commit is contained in:
@@ -650,7 +650,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").
|
||||
|
Reference in New Issue
Block a user