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 'master' into pu/mp

Browse Source 
Origin commit data
------------------
Commit: 4b8cf23d70
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-16 (Mon, 16 Oct 2017)
This commit is contained in:
Jacek Jendrzej
2017-10-16 13:17:17 +02:00
parent 1c28e16adb 702fd00c19
commit 041101db81
20 changed files with 360 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/streaminfo2.cpp
View File

@@ -650,6 +650,9 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
ddmode is always 1 ("CH1/CH2").
*/
audioDecoder->getAudioInfo(type, layer, freq, lbitrate, mode);
std::string desc = "N/A";
if (!g_RemoteControl->current_PIDs.APIDs.empty())
desc = g_RemoteControl->current_PIDs.APIDs[g_RemoteControl->current_PIDs.PIDs.selected_apid].desc;
if (type == AUDIO_FMT_MPEG || type == AUDIO_FMT_MP3)
{
@@ -661,9 +664,9 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
"single_ch"
};
int max_mode = sizeof(mpegmodes) / sizeof(mpegmodes[0]);
snprintf(buf, sizeof(buf), "%s %s (%d)",type == AUDIO_FMT_MPEG ? "MPEG":"MP3",
snprintf(buf, sizeof(buf), "MPEG %s (%d) (%s)",
(mode > max_mode) ? "unk" : mpegmodes[mode],
freq);
freq, desc.c_str());
}
else if (type == AUDIO_FMT_DOLBY_DIGITAL || type == AUDIO_FMT_DD_PLUS)
{
@@ -679,10 +682,10 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
"L/C/R/SL/SR"
};
int max_mode = sizeof(ddmodes) / sizeof(ddmodes[0]);
snprintf(buf, sizeof(buf), "%s %s (%d)",
snprintf(buf, sizeof(buf), "%s %s (%d) (%s)",
(type == AUDIO_FMT_DOLBY_DIGITAL) ? "DD" : "DD+",
(mode > max_mode) ? "unk" : ddmodes[mode],
freq);
freq, desc.c_str());
}
else if (type == AUDIO_FMT_AAC || type == AUDIO_FMT_AAC_PLUS)
{
@@ -700,16 +703,16 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
"Dual-Mono"
};
int max_mode = sizeof(aacmodes) / sizeof(aacmodes[0]);
snprintf(buf, sizeof(buf), "%s %s (%d)",
snprintf(buf, sizeof(buf), "%s %s (%d) (%s)",
(type == AUDIO_FMT_AAC) ? "AAC" : "AAC+",
(mode > max_mode) ? "unk" : aacmodes[mode],
freq);
freq, desc.c_str());
}
else
{
snprintf(buf, sizeof(buf), "%s (%d)",
snprintf(buf, sizeof(buf), "%s (%d) (%s)",
g_Locale->getText(LOCALE_STREAMINFO_AUDIOTYPE_UNKNOWN),
freq);
freq, desc.c_str());
}
g_Font[font_info]->RenderString (xpos+spaceoffset, ypos, box_width2, buf, COL_MENUCONTENT_TEXT);