mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


Origin commit data
------------------
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)
This commit is contained in:
vanhofen
2016-11-21 12:46:49 +01:00
parent 61e7e48f05 940432f3aa
commit 65e0a39980
125 changed files with 3517 additions and 3169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/gui/streaminfo2.cpp
View File

@@ -651,24 +651,48 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
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);
if(type == AUDIO_FMT_MPEG) {
const int max_mode = 4;
const char *mpegmodes[max_mode] = { "stereo", "joint_st", "dual_ch", "single_ch" };
snprintf(buf, sizeof(buf), "MPEG %s (%d)", (mode > max_mode) ?"unk":mpegmodes[mode], freq);
} else if (type == AUDIO_FMT_DOLBY_DIGITAL || type == AUDIO_FMT_DD_PLUS) {
const int max_mode = 8;
const char *ddmodes[max_mode] = { "CH1/CH2", "C", "L/R", "L/C/R", "L/R/S", "L/C/R/S", "L/R/SL/SR", "L/C/R/SL/SR" };
if (type == AUDIO_FMT_MPEG)
{
const char *mpegmodes[] =
{
"stereo",
"joint_st",
"dual_ch",
"single_ch"
};
int max_mode = sizeof(mpegmodes) / sizeof(mpegmodes[0]);
snprintf(buf, sizeof(buf), "MPEG %s (%d)",
(mode > max_mode) ? "unk" : mpegmodes[mode],
freq);
}
else if (type == AUDIO_FMT_DOLBY_DIGITAL || type == AUDIO_FMT_DD_PLUS)
{
const char *ddmodes[] =
{
"CH1/CH2",
"C",
"L/R",
"L/C/R",
"L/R/S",
"L/C/R/S",
"L/R/SL/SR",
"L/C/R/SL/SR"
};
int max_mode = sizeof(ddmodes) / sizeof(ddmodes[0]);
snprintf(buf, sizeof(buf), "%s %s (%d)",
(type == AUDIO_FMT_DOLBY_DIGITAL) ? "DD" : "DD+",
(mode > max_mode) ?"unk": ddmodes[mode],
(mode > max_mode) ? "unk" : ddmodes[mode],
freq);
} else if (type == AUDIO_FMT_AAC || type == AUDIO_FMT_AAC_PLUS) {
const int max_mode = 10;
const char *aacmodes[max_mode] = {
}
else if (type == AUDIO_FMT_AAC || type == AUDIO_FMT_AAC_PLUS)
{
const char *aacmodes[] =
{
"N/S",
"Mono",
"L/R",
@@ -680,11 +704,17 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
"L/R/SL/SR",
"Dual-Mono"
};
int max_mode = sizeof(aacmodes) / sizeof(aacmodes[0]);
snprintf(buf, sizeof(buf), "%s %s (%d)",
(type == AUDIO_FMT_AAC) ? "AAC" : "AAC+",
(mode > max_mode) ?"unk":aacmodes[mode], freq);
} else {
snprintf(buf, sizeof(buf), "%s (%d)", g_Locale->getText(LOCALE_STREAMINFO_AUDIOTYPE_UNKNOWN), freq);
(mode > max_mode) ? "unk" : aacmodes[mode],
freq);
}
else
{
snprintf(buf, sizeof(buf), "%s (%d)",
g_Locale->getText(LOCALE_STREAMINFO_AUDIOTYPE_UNKNOWN),
freq);
}
g_Font[font_info]->RenderString (xpos+spaceoffset, ypos, box_width2, buf, COL_MENUCONTENT_TEXT);