Ticket #8103: appleremote-prefs.trunk.diff
File appleremote-prefs.trunk.diff, 1.8 KB (added by , 15 years ago) |
---|
-
libs/libmythui/AppleRemote.cpp
18 18 #include <sstream> 19 19 20 20 #include "mythverbose.h" 21 #include "mythdb.h" 21 22 22 23 AppleRemote* AppleRemote::_instance = 0; 23 24 const char* const AppleRemote::AppleRemoteDeviceName = "AppleIRController"; … … 56 57 { 57 58 if (queue != NULL) // already listening 58 59 return; 59 60 61 if (GetMythDB()->GetNumSetting("AppleRemoteDisabled", 0)) 62 return; 63 60 64 io_object_t hidDevice = _findAppleRemoteDevice(); 61 65 62 66 if (hidDevice == 0) goto error; -
programs/mythfrontend/globalsettings.cpp
2310 2310 return ge; 2311 2311 } 2312 2312 2313 static HostCheckBox *AppleRemoteDisabled() 2314 { 2315 HostCheckBox *gc = new HostCheckBox("AppleRemoteDisabled"); 2316 gc->setLabel(QObject::tr("Disable listening to Apple IR Receiver")); 2317 gc->setValue(false); 2318 gc->setHelpText(QObject::tr("When enabled, MythTV will not take " 2319 "control of the Apple Remote receiver.")); 2320 return gc; 2321 } 2322 2313 2323 static HostLineEdit *ScreenShotPath() 2314 2324 { 2315 2325 HostLineEdit *ge = new HostLineEdit("ScreenShotPath"); … … 4254 4264 remotecontrol->setLabel(QObject::tr("Remote Control")); 4255 4265 remotecontrol->addChild(LircDaemonDevice()); 4256 4266 remotecontrol->addChild(LircKeyPressedApp()); 4267 #ifdef USING_APPLEREMOTE 4268 remotecontrol->addChild(AppleRemoteDisabled()); 4269 #endif 4257 4270 remotecontrol->addChild(NetworkControlEnabled()); 4258 4271 remotecontrol->addChild(NetworkControlPort()); 4259 4272 addChild(remotecontrol);