mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 00:11:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'check/next-cc'

Browse Source 
Compiles on most platforms, starts. Not really tested.
This commit is contained in:
Stefan Seyfried
2013-11-10 16:55:53 +01:00
parent 23d8cc6434 1e8764be2e
commit b93a372b54
114 changed files with 7292 additions and 1585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/gui/audio_setup.cpp
View File

@@ -157,16 +157,19 @@ int CAudioSetup::showAudioSetup()
CMenuOptionChooser * as_oj_dd_spdif = new CMenuOptionChooser(LOCALE_AUDIOMENU_SPDIF_DD, &g_settings.spdif_dd, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, audioSetupNotifier);
as_oj_dd_spdif->setHint("", LOCALE_MENU_HINT_AUDIO_SPDIF_DD);
//av synch
CMenuOptionChooser * as_oj_avsync = new CMenuOptionChooser(LOCALE_AUDIOMENU_AVSYNC, &g_settings.avsync, AUDIOMENU_AVSYNC_OPTIONS, AUDIOMENU_AVSYNC_OPTION_COUNT, true, audioSetupNotifier);
as_oj_avsync->setHint("", LOCALE_MENU_HINT_AUDIO_AVSYNC);
CMenuOptionChooser * as_oj_avsync = NULL;
CMenuOptionNumberChooser * as_oj_vsteps = NULL;
if (!g_settings.easymenu) {
//av synch
as_oj_avsync = new CMenuOptionChooser(LOCALE_AUDIOMENU_AVSYNC, &g_settings.avsync, AUDIOMENU_AVSYNC_OPTIONS, AUDIOMENU_AVSYNC_OPTION_COUNT, true, audioSetupNotifier);
as_oj_avsync->setHint("", LOCALE_MENU_HINT_AUDIO_AVSYNC);
//volume steps
CMenuOptionNumberChooser * as_oj_vsteps = new CMenuOptionNumberChooser(LOCALE_AUDIOMENU_VOLUME_STEP, (int *)&g_settings.current_volume_step, true, 1, 25, NULL);
as_oj_vsteps->setHint("", LOCALE_MENU_HINT_AUDIO_VOLSTEP);
//clock rec
// CMenuOptionChooser * as_oj_clockrec new CMenuOptionChooser(LOCALE_AUDIOMENU_CLOCKREC, &g_settings.clockrec, AUDIOMENU_CLOCKREC_OPTIONS, AUDIOMENU_CLOCKREC_OPTION_COUNT, true, audioSetupNotifier);
//volume steps
as_oj_vsteps = new CMenuOptionNumberChooser(LOCALE_AUDIOMENU_VOLUME_STEP, (int *)&g_settings.current_volume_step, true, 1, 25, NULL);
as_oj_vsteps->setHint("", LOCALE_MENU_HINT_AUDIO_VOLSTEP);
//clock rec
//CMenuOptionChooser * as_oj_clockrec new CMenuOptionChooser(LOCALE_AUDIOMENU_CLOCKREC, &g_settings.clockrec, AUDIOMENU_CLOCKREC_OPTIONS, AUDIOMENU_CLOCKREC_OPTION_COUNT, true, audioSetupNotifier);
}
#if HAVE_COOL_HARDWARE
/* only coolstream has SRS stuff, so only compile it there */
@@ -204,11 +207,13 @@ int CAudioSetup::showAudioSetup()
audioSettings->addItem(as_oj_dd_hdmi);
audioSettings->addItem(as_oj_dd_spdif);
audioSettings->addItem(as_oj_ddsubchn);
audioSettings->addItem(GenericMenuSeparatorLine);
//---------------------------------------------------------
audioSettings->addItem(as_oj_avsync);
audioSettings->addItem(as_oj_vsteps);
// audioSettings->addItem(as_clockrec);
if (!g_settings.easymenu) {
audioSettings->addItem(GenericMenuSeparatorLine);
audioSettings->addItem(as_oj_avsync);
audioSettings->addItem(as_oj_vsteps);
//audioSettings->addItem(as_clockrec);
}
//---------------------------------------------------------
#if HAVE_COOL_HARDWARE
/* only coolstream has SRS stuff, so only compile it there */