mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-07 21:58:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/Makefile.am
	src/gui/imageinfo_ni.cpp
	src/gui/movieplayer.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b934995ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-12 22:17:17 +01:00
parent 826d527841 b9b5808928
commit afda007d95
46 changed files with 220 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/audio_setup.cpp
View File

@@ -94,7 +94,7 @@ const CMenuOptionChooser::keyval AUDIOMENU_ANALOGOUT_OPTIONS[AUDIOMENU_ANALOGOUT
{ 2, LOCALE_AUDIOMENU_MONORIGHT }
};
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
#define AUDIOMENU_SRS_OPTION_COUNT 3
#else
#define AUDIOMENU_SRS_OPTION_COUNT 2
@@ -103,7 +103,7 @@ const CMenuOptionChooser::keyval AUDIOMENU_SRS_OPTIONS[AUDIOMENU_SRS_OPTION_COUN
{
{ 0 , LOCALE_AUDIO_SRS_ALGO_LIGHT },
{ 1 , LOCALE_AUDIO_SRS_ALGO_NORMAL },
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
{ 2 , LOCALE_AUDIO_SRS_ALGO_HEAVY }
#endif
};
@@ -244,7 +244,7 @@ int CAudioSetup::showAudioSetup()
audioSettings->addItem(GenericMenuSeparatorLine);
audioSettings->addItem(as_oj_srsonoff);
audioSettings->addItem(as_oj_algo);
#ifndef BOXMODEL_APOLLO
#ifndef BOXMODEL_CS_HD2
audioSettings->addItem(as_oj_noise);
#endif
audioSettings->addItem(as_oj_volrev);
@@ -262,7 +262,7 @@ int CAudioSetup::showAudioSetup()
int res = audioSettings->exec(NULL, "");
selected = audioSettings->getSelected();
delete audioSettings;
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
delete as_oj_noise;
#endif
if (!g_settings.easymenu)