diff --git a/Limelight/Input/ControllerSupport.m b/Limelight/Input/ControllerSupport.m
index 2c53460..4894bcb 100644
--- a/Limelight/Input/ControllerSupport.m
+++ b/Limelight/Input/ControllerSupport.m
@@ -303,7 +303,7 @@ static const double MOUSE_SPEED_DIVISOR = 2.5;
short rightStickX, rightStickY;
unsigned char leftTrigger, rightTrigger;
- if (_swapABXYButtons) {
+ if (self->_swapABXYButtons) {
UPDATE_BUTTON_FLAG(limeController, B_FLAG, gamepad.buttonA.pressed);
UPDATE_BUTTON_FLAG(limeController, A_FLAG, gamepad.buttonB.pressed);
UPDATE_BUTTON_FLAG(limeController, Y_FLAG, gamepad.buttonX.pressed);
@@ -370,7 +370,7 @@ static const double MOUSE_SPEED_DIVISOR = 2.5;
else if (controller.gamepad != NULL) {
controller.gamepad.valueChangedHandler = ^(GCGamepad *gamepad, GCControllerElement *element) {
Controller* limeController = [self->_controllers objectForKey:[NSNumber numberWithInteger:gamepad.controller.playerIndex]];
- if (_swapABXYButtons) {
+ if (self->_swapABXYButtons) {
UPDATE_BUTTON_FLAG(limeController, B_FLAG, gamepad.buttonA.pressed);
UPDATE_BUTTON_FLAG(limeController, A_FLAG, gamepad.buttonB.pressed);
UPDATE_BUTTON_FLAG(limeController, Y_FLAG, gamepad.buttonX.pressed);
diff --git a/Limelight/Limelight.xcdatamodeld/.xccurrentversion b/Limelight/Limelight.xcdatamodeld/.xccurrentversion
index 980be35..0fc2e47 100644
--- a/Limelight/Limelight.xcdatamodeld/.xccurrentversion
+++ b/Limelight/Limelight.xcdatamodeld/.xccurrentversion
@@ -3,6 +3,6 @@
_XCCurrentVersionName
- Moonlight v1.7.xcdatamodel
+ Moonlight v1.8.xcdatamodel
diff --git a/Limelight/Limelight.xcdatamodeld/Moonlight v1.7.xcdatamodel/contents b/Limelight/Limelight.xcdatamodeld/Moonlight v1.7.xcdatamodel/contents
index a99fd78..712c76a 100644
--- a/Limelight/Limelight.xcdatamodeld/Moonlight v1.7.xcdatamodel/contents
+++ b/Limelight/Limelight.xcdatamodeld/Moonlight v1.7.xcdatamodel/contents
@@ -1,5 +1,5 @@
-
+
@@ -33,7 +33,6 @@
-
@@ -42,6 +41,6 @@
-
+
\ No newline at end of file
diff --git a/Limelight/Limelight.xcdatamodeld/Moonlight v1.8.xcdatamodel/contents b/Limelight/Limelight.xcdatamodeld/Moonlight v1.8.xcdatamodel/contents
new file mode 100644
index 0000000..19d6d78
--- /dev/null
+++ b/Limelight/Limelight.xcdatamodeld/Moonlight v1.8.xcdatamodel/contents
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Moonlight TV/Settings.bundle/Root.plist b/Moonlight TV/Settings.bundle/Root.plist
index 8e4cc40..975f11b 100644
--- a/Moonlight TV/Settings.bundle/Root.plist
+++ b/Moonlight TV/Settings.bundle/Root.plist
@@ -154,6 +154,16 @@
DefaultValue
+
+ Type
+ PSToggleSwitchSpecifier
+ Title
+ Swap A/B and X/Y Buttons
+ Key
+ swapABXYButtons
+ DefaultValue
+
+
Type
PSToggleSwitchSpecifier
diff --git a/Moonlight.xcodeproj/project.pbxproj b/Moonlight.xcodeproj/project.pbxproj
index e7d7ad6..e69137b 100644
--- a/Moonlight.xcodeproj/project.pbxproj
+++ b/Moonlight.xcodeproj/project.pbxproj
@@ -180,6 +180,7 @@
9827E7A7251436EA00F25707 /* HapticContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HapticContext.h; sourceTree = ""; };
9832D1341BBCD5C50036EF48 /* TemporaryApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TemporaryApp.h; path = Database/TemporaryApp.h; sourceTree = ""; };
9832D1351BBCD5C50036EF48 /* TemporaryApp.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TemporaryApp.m; path = Database/TemporaryApp.m; sourceTree = ""; };
+ 984CD023288A310D0097D2D4 /* Moonlight v1.8.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Moonlight v1.8.xcdatamodel"; sourceTree = ""; };
98517B1B21CE0A9000481377 /* Moonlight v1.3.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Moonlight v1.3.xcdatamodel"; sourceTree = ""; };
98608BDD22DC0C2C000E5672 /* Moonlight v1.4.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Moonlight v1.4.xcdatamodel"; sourceTree = ""; };
9865DC3B2132922E0005B9B9 /* GameController.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameController.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS11.4.sdk/System/Library/Frameworks/GameController.framework; sourceTree = DEVELOPER_DIR; };
@@ -1433,6 +1434,7 @@
FB290D0519B2C406004C83CF /* Limelight.xcdatamodeld */ = {
isa = XCVersionGroup;
children = (
+ 984CD023288A310D0097D2D4 /* Moonlight v1.8.xcdatamodel */,
566E9D2B2770B23A00EF7BFE /* Moonlight v1.7.xcdatamodel */,
9819CC25254F2734008A7C8E /* Moonlight v1.6.xcdatamodel */,
98783FEA242EAC5D00F00EF4 /* Moonlight v1.5.xcdatamodel */,
@@ -1446,7 +1448,7 @@
FB4678F21A51BDCB00377732 /* Limelight 0.3.0.xcdatamodel */,
FB290D0619B2C406004C83CF /* Limelight.xcdatamodel */,
);
- currentVersion = 566E9D2B2770B23A00EF7BFE /* Moonlight v1.7.xcdatamodel */;
+ currentVersion = 984CD023288A310D0097D2D4 /* Moonlight v1.8.xcdatamodel */;
path = Limelight.xcdatamodeld;
sourceTree = "";
versionGroupType = wrapper.xcdatamodel;
diff --git a/iPad.storyboard b/iPad.storyboard
index cf9e822..d0f87e2 100644
--- a/iPad.storyboard
+++ b/iPad.storyboard
@@ -71,7 +71,7 @@
-
+
@@ -92,7 +92,7 @@
-
+
@@ -123,7 +123,7 @@
-
+
@@ -141,7 +141,7 @@
-
+
@@ -193,16 +193,6 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/iPhone.storyboard b/iPhone.storyboard
index d7ce373..312542e 100644
--- a/iPhone.storyboard
+++ b/iPhone.storyboard
@@ -93,7 +93,7 @@
-
+
@@ -113,7 +113,7 @@
-
+
@@ -136,14 +136,14 @@
-
+
@@ -153,14 +153,14 @@
-
+
@@ -172,14 +172,14 @@
-
+
@@ -189,14 +189,14 @@
-
+
@@ -206,14 +206,14 @@
-
+
@@ -223,14 +223,14 @@
-
+
@@ -240,14 +240,14 @@
-
+
@@ -257,14 +257,14 @@
-
+
@@ -274,14 +274,14 @@
-
+
@@ -291,14 +291,14 @@
-
+
@@ -308,14 +308,14 @@
-
+
@@ -342,8 +342,8 @@
-
+