Ticket #8103: appleremote-prefs.trunk.diff

libs/libmythui/AppleRemote.cpp

@@ -18 +18 @@
 #include <sstream>
 
 #include "mythverbose.h"
+#include "mythdb.h"
 
 AppleRemote*      AppleRemote::_instance = 0;
 const char* const AppleRemote::AppleRemoteDeviceName = "AppleIRController";
@@ -56 +57 @@
 {
     if (queue != NULL)   // already listening
         return;
- 
+
+    if (GetMythDB()->GetNumSetting("AppleRemoteDisabled", 0))
+        return;
+
     io_object_t hidDevice = _findAppleRemoteDevice();
 
     if (hidDevice == 0) goto error;

programs/mythfrontend/globalsettings.cpp

@@ -2310 +2310 @@
     return ge;
 }
 
+static HostCheckBox *AppleRemoteDisabled()
+{
+    HostCheckBox *gc = new HostCheckBox("AppleRemoteDisabled");
+    gc->setLabel(QObject::tr("Disable listening to Apple IR Receiver"));
+    gc->setValue(false);
+    gc->setHelpText(QObject::tr("When enabled, MythTV will not take "
+                    "control of the Apple Remote receiver."));
+    return gc;
+}
+
 static HostLineEdit *ScreenShotPath()
 {
     HostLineEdit *ge = new HostLineEdit("ScreenShotPath");
@@ -4254 +4264 @@
     remotecontrol->setLabel(QObject::tr("Remote Control"));
     remotecontrol->addChild(LircDaemonDevice());
     remotecontrol->addChild(LircKeyPressedApp());
+#ifdef USING_APPLEREMOTE
+    remotecontrol->addChild(AppleRemoteDisabled());
+#endif
     remotecontrol->addChild(NetworkControlEnabled());
     remotecontrol->addChild(NetworkControlPort());
     addChild(remotecontrol);