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

neutrino: phase out last bits of controld code

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1825 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
seife
2011-11-05 11:44:03 +00:00
parent 996d7feee4
commit 7f9cbe76da
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@@ -128,7 +128,6 @@ lib/libeventserver/Makefile
lib/libmd5sum/Makefile lib/libmd5sum/Makefile
lib/libnet/Makefile lib/libnet/Makefile
lib/xmltree/Makefile lib/xmltree/Makefile
lib/controldclient/Makefile
lib/sectionsdclient/Makefile lib/sectionsdclient/Makefile
lib/timerdclient/Makefile lib/timerdclient/Makefile
lib/libtriple/Makefile lib/libtriple/Makefile

4
src/global.h
View File

@@ -34,7 +34,9 @@
#include <zapit/client/zapitclient.h> #include <zapit/client/zapitclient.h>
#ifdef HAVE_CONTROLD
#include <controldclient/controldclient.h> #include <controldclient/controldclient.h>
#endif
#include <sectionsdclient/sectionsdclient.h> #include <sectionsdclient/sectionsdclient.h>
#include <timerdclient/timerdclient.h> #include <timerdclient/timerdclient.h>
@@ -79,7 +81,9 @@
NEUTRINO_CPP SNeutrinoSettings g_settings; NEUTRINO_CPP SNeutrinoSettings g_settings;
NEUTRINO_CPP SglobalInfo g_info; NEUTRINO_CPP SglobalInfo g_info;
#ifdef HAVE_CONTROLD
NEUTRINO_CPP CControldClient *g_Controld; NEUTRINO_CPP CControldClient *g_Controld;
#endif
NEUTRINO_CPP CZapitClient *g_Zapit; NEUTRINO_CPP CZapitClient *g_Zapit;
NEUTRINO_CPP CSectionsdClient *g_Sectionsd; NEUTRINO_CPP CSectionsdClient *g_Sectionsd;
NEUTRINO_CPP CTimerdClient *g_Timerd; NEUTRINO_CPP CTimerdClient *g_Timerd;

2
src/neutrino.cpp
View File

@@ -2731,6 +2731,7 @@ _repeat:
//setVolume(msg, false, true); //setVolume(msg, false, true);
return messages_return::handled; return messages_return::handled;
} }
#ifdef HAVE_CONTROLD
else if( msg == NeutrinoMessages::EVT_VCRCHANGED ) { else if( msg == NeutrinoMessages::EVT_VCRCHANGED ) {
if (g_settings.vcr_AutoSwitch) { if (g_settings.vcr_AutoSwitch) {
if( data != VCR_STATUS_OFF ) if( data != VCR_STATUS_OFF )
@@ -2740,6 +2741,7 @@ _repeat:
} }
return messages_return::handled | messages_return::cancel_info; return messages_return::handled | messages_return::cancel_info;
} }
#endif
else if( msg == NeutrinoMessages::EVT_MUTECHANGED ) { else if( msg == NeutrinoMessages::EVT_MUTECHANGED ) {
#if 0 #if 0
CControldMsg::commandMute* cmd = (CControldMsg::commandMute*) data; CControldMsg::commandMute* cmd = (CControldMsg::commandMute*) data;