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

Merge branch 'master' into dvbsi++

Browse Source
This commit is contained in:
[CST] Focus
2012-04-17 15:07:22 +04:00
parent 42b7cb33ab 3b0394d3eb
commit dda6d45e5d
3 changed files with 8 additions and 3 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))) {

3
src/zapit/include/zapit/zapit.h
View File

@@ -123,7 +123,7 @@ class CZapit : public OpenThreads::Thread
CFrontend * live_fe; CFrontend * live_fe;
audio_map_t audio_map; audio_map_t audio_map;
bool current_is_nvod; //bool current_is_nvod;
//bool standby; //bool standby;
t_channel_id lastChannelRadio; t_channel_id lastChannelRadio;
t_channel_id lastChannelTV; t_channel_id lastChannelTV;
@@ -167,6 +167,7 @@ class CZapit : public OpenThreads::Thread
diseqc_t diseqcType; diseqc_t diseqcType;
int video_mode; int video_mode;
CConfigFile configfile; CConfigFile configfile;
bool current_is_nvod;
bool standby; bool standby;
Zapit_config config; Zapit_config config;
CZapitSdtMonitor SdtMonitor; CZapitSdtMonitor SdtMonitor;

2
src/zapit/src/zapit.cpp
View File

@@ -2094,6 +2094,8 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg)
bool CZapit::Stop() bool CZapit::Stop()
{ {
if(!started)
return false;
started = false; started = false;
int ret = join(); int ret = join();
return (ret == 0); return (ret == 0);