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

Removed libcontrold dependency

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@336 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 35d7d555b6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-02-14 (Sun, 14 Feb 2010)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2010-02-14 13:09:07 +00:00
parent f789c1e8c6
commit b4e06b4d0b
15 changed files with 44 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/neutrino.cpp
View File

@@ -299,9 +299,7 @@ static void initGlobals(void)
g_fontRenderer = NULL;
g_RCInput = NULL;
//g_Controld = new CControldClient;
g_Timerd = NULL;
//g_Zapit = new CZapitClient;
g_RemoteControl = NULL;
g_EpgData = NULL;
@@ -2445,12 +2443,6 @@ int CNeutrinoApp::run(int argc, char **argv)
InitScanSettings(_scanSettings);
dprintf( DEBUG_NORMAL, "registering as event client\n");
#if 0
g_Controld->registerEvent(CControldClient::EVT_MUTECHANGED, 222, NEUTRINO_UDS_NAME);
g_Controld->registerEvent(CControldClient::EVT_VOLUMECHANGED, 222, NEUTRINO_UDS_NAME);
g_Controld->registerEvent(CControldClient::EVT_MODECHANGED, 222, NEUTRINO_UDS_NAME);
g_Controld->registerEvent(CControldClient::EVT_VCRCHANGED, 222, NEUTRINO_UDS_NAME);
#endif
g_Sectionsd->registerEvent(CSectionsdClient::EVT_TIMESET, 222, NEUTRINO_UDS_NAME);
g_Sectionsd->registerEvent(CSectionsdClient::EVT_GOT_CN_EPG, 222, NEUTRINO_UDS_NAME);
@@ -3148,9 +3140,11 @@ _repeat:
return messages_return::handled | messages_return::cancel_info;
}
else if( msg == NeutrinoMessages::EVT_MUTECHANGED ) {
#if 0
CControldMsg::commandMute* cmd = (CControldMsg::commandMute*) data;
if(cmd->type == (CControld::volume_type)g_settings.audio_avs_Control)
AudioMute( cmd->mute, true );
#endif
delete[] (unsigned char*) data;
return messages_return::handled;
}
@@ -3728,13 +3722,11 @@ void CNeutrinoApp::setVolume(const neutrino_msg_t key, const bool bDoPaint, bool
}
setvol(g_settings.current_volume,(g_settings.audio_avs_Control));
//timeoutEnd = CRCInput::calcTimeoutEnd(nowait ? 1 : g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] / 2);
timeoutEnd = CRCInput::calcTimeoutEnd(nowait ? 1 : 3);
}
else if (msg == NeutrinoMessages::EVT_VOLCHANGED) {
//current_volume = g_Controld->getVolume((CControld::volume_type)g_settings.audio_avs_Control);//FIXME
//printf("setVolume EVT_VOLCHANGED %d\n", current_volume);
//timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] / 2);
timeoutEnd = CRCInput::calcTimeoutEnd(3);
}
else if (handleMsg(msg, data) & messages_return::unhandled) {