mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-28 16:01:10 +02:00
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
src/gui/streaminfo2.cpp
Origin commit data
------------------
Commit: 0538176850
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)
This commit is contained in:
@@ -621,13 +621,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);
|
||||
printf("\n**** mode: %d\n\n", 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[] =
|
||||
|
Reference in New Issue
Block a user