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

driver/volume.cpp: comment second creation of g_Zapit, g_RCInput; Use global g_RemoteControl

Browse Source
This commit is contained in:
[CST] Focus
2012-04-17 14:51:51 +04:00
parent 42813063aa
commit 016ab6c088
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/driver/volume.cpp
View File

@@ -44,16 +44,18 @@
#endif #endif
CFrameBuffer * frameBuffer; CFrameBuffer * frameBuffer;
CRemoteControl * v_RemoteControl; extern CRemoteControl * g_RemoteControl;
extern cAudio * audioDecoder; extern cAudio * audioDecoder;
static CProgressBar *g_volscale = NULL; static CProgressBar *g_volscale = NULL;
CVolume::CVolume() CVolume::CVolume()
{ {
frameBuffer = CFrameBuffer::getInstance(); frameBuffer = CFrameBuffer::getInstance();
#if 0
g_Zapit = new CZapitClient; g_Zapit = new CZapitClient;
g_RCInput = new CRCInput; g_RCInput = new CRCInput;
v_RemoteControl = new CRemoteControl; v_RemoteControl = new CRemoteControl;
#endif
VolumeFont = SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO; VolumeFont = SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO;
paintDigits = true; // For future On/Off digits paintDigits = true; // For future On/Off digits
paintShadow = false; // For future On/Off switch shadow paintShadow = false; // For future On/Off switch shadow
@@ -256,7 +258,7 @@ void CVolume::setVolume(const neutrino_msg_t key, const bool bDoPaint, bool nowa
if (msg <= CRCInput::RC_MaxRC) if (msg <= CRCInput::RC_MaxRC)
{ {
int sub_chan_keybind = 0; int sub_chan_keybind = 0;
if (g_settings.mode_left_right_key_tv == SNeutrinoSettings::VOLUME && v_RemoteControl->subChannels.size() < 1) if (g_settings.mode_left_right_key_tv == SNeutrinoSettings::VOLUME && g_RemoteControl->subChannels.size() < 1)
sub_chan_keybind = 1; sub_chan_keybind = 1;
if ((msg == CRCInput::RC_plus) || (sub_chan_keybind == 1 && (msg == CRCInput::RC_right))) { if ((msg == CRCInput::RC_plus) || (sub_chan_keybind == 1 && (msg == CRCInput::RC_right))) {