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

gui/audio_select.cpp: add PID volume adjusting

Browse Source
This commit is contained in:
[CST] Focus
2012-08-16 15:55:59 +04:00
parent 49f67b02f4
commit b8f78e9c5d
1 changed files with 41 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/gui/audio_select.cpp
View File

@@ -40,6 +40,8 @@
#include <gui/widget/icons.h> #include <gui/widget/icons.h>
#include <gui/widget/menue.h> #include <gui/widget/menue.h>
#include <driver/screen_max.h> #include <driver/screen_max.h>
#include <driver/volume.h>
#include <zapit/zapit.h>
extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */ extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
extern CAudioSetupNotifier * audioSetupNotifier; extern CAudioSetupNotifier * audioSetupNotifier;
@@ -103,34 +105,31 @@ int CAudioSelectMenuHandler::doMenu ()
unsigned int shortcut_num = 1; unsigned int shortcut_num = 1;
uint p_count = g_RemoteControl->current_PIDs.APIDs.size();
// -- setup menue due to Audio PIDs // -- setup menue due to Audio PIDs
if (g_RemoteControl->current_PIDs.APIDs.size() > 1) for( uint i=0; i < p_count; i++ )
{ {
uint p_count = g_RemoteControl->current_PIDs.APIDs.size(); char apid[5];
CMenuForwarderNonLocalized* fw[p_count]; sprintf(apid, "%d", i);
CMenuForwarderNonLocalized *fw = new CMenuForwarderNonLocalized(g_RemoteControl->current_PIDs.APIDs[i].desc,
for( uint i=0; i < p_count; i++ ) true, NULL, this, apid, CRCInput::convertDigitToKey(i + 1));
{ fw->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true);
char apid[5]; AudioSelector.addItem(fw, (i == g_RemoteControl->current_PIDs.PIDs.selected_apid));
sprintf(apid, "%d", i); shortcut_num = i+1;
fw[i] = new CMenuForwarderNonLocalized(g_RemoteControl->current_PIDs.APIDs[i].desc, true, NULL, this, apid, CRCInput::convertDigitToKey(i + 1));
fw[i]->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true);
AudioSelector.addItem(fw[i], (i == g_RemoteControl->current_PIDs.PIDs.selected_apid));
shortcut_num = i+1;
}
AudioSelector.addItem(GenericMenuSeparatorLine);
} }
if (p_count)
AudioSelector.addItem(GenericMenuSeparatorLine);
// -- setup menue for to Dual Channel Stereo // -- setup menue for to Dual Channel Stereo
CMenuOptionChooser* oj = new CMenuOptionChooser(LOCALE_AUDIOMENU_ANALOG_MODE, CMenuOptionChooser* oj = new CMenuOptionChooser(LOCALE_AUDIOMENU_ANALOG_MODE,
&g_settings.audio_AnalogMode, &g_settings.audio_AnalogMode,
AUDIOMENU_ANALOGOUT_OPTIONS, AUDIOMENU_ANALOGOUT_OPTION_COUNT, AUDIOMENU_ANALOGOUT_OPTIONS, AUDIOMENU_ANALOGOUT_OPTION_COUNT,
true, audioSetupNotifier, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED); true, audioSetupNotifier, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
AudioSelector.addItem( oj ); AudioSelector.addItem( oj );
oj = new CMenuOptionChooser(LOCALE_AUDIOMENU_ANALOG_OUT, &g_settings.analog_out, oj = new CMenuOptionChooser(LOCALE_AUDIOMENU_ANALOG_OUT, &g_settings.analog_out,
OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT,
true, audioSetupNotifier, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN); true, audioSetupNotifier, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
AudioSelector.addItem( oj ); AudioSelector.addItem( oj );
@@ -184,5 +183,19 @@ int CAudioSelectMenuHandler::doMenu ()
AudioSelector.addItem(new CMenuForwarder(LOCALE_SUBTITLES_STOP, true, NULL, &SubtitleChanger, "off", CRCInput::RC_stop)); AudioSelector.addItem(new CMenuForwarder(LOCALE_SUBTITLES_STOP, true, NULL, &SubtitleChanger, "off", CRCInput::RC_stop));
} }
AudioSelector.addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_AUDIOMENU_VOLUME_ADJUST));
/* setting volume percent to zapit with channel_id/apid = 0 means current channel and pid */
CVolume::getInstance()->SetCurrentChannel(0);
CVolume::getInstance()->SetCurrentPid(0);
int percent[p_count];
for (uint i=0; i < p_count; i++) {
percent[i] = CZapit::getInstance()->GetPidVolume(0, g_RemoteControl->current_PIDs.APIDs[i].pid);
AudioSelector.addItem(new CMenuOptionNumberChooser(NONEXISTANT_LOCALE, &percent[i],
i == g_RemoteControl->current_PIDs.PIDs.selected_apid,
0, 999, CVolume::getInstance(), 0, 0, NONEXISTANT_LOCALE,
g_RemoteControl->current_PIDs.APIDs[i].desc));
}
return AudioSelector.exec(NULL, ""); return AudioSelector.exec(NULL, "");
} }