Merge branch '1.0.7b' into defender

emufreak · Dec 11, 2014 · dcbbf4f · dcbbf4f
2 parents e1d3873 + 0ae48fb
commit dcbbf4f
Show file tree

Hide file tree

Showing 19 changed files with 322 additions and 59 deletions.
diff --git a/Classes/File Browser/EMUROMBrowserView-ipad.xib b/Classes/File Browser/EMUROMBrowserView-ipad.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6254" systemVersion="14B25" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
         <deployment version="800" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="EMUROMBrowserViewController">

diff --git a/Classes/File Browser/EMUROMBrowserView.xib b/Classes/File Browser/EMUROMBrowserView.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6254" systemVersion="14B25" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
         <deployment version="800" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="EMUROMBrowserViewController">

diff --git a/Classes/SelectEffectController.xib b/Classes/SelectEffectController.xib
@@ -2,13 +2,13 @@
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1792</int>
-		<string key="IBDocument.SystemVersion">14A389</string>
-		<string key="IBDocument.InterfaceBuilderVersion">6250</string>
-		<string key="IBDocument.AppKitVersion">1343.14</string>
+		<string key="IBDocument.SystemVersion">14B25</string>
+		<string key="IBDocument.InterfaceBuilderVersion">6254</string>
+		<string key="IBDocument.AppKitVersion">1343.16</string>
 		<string key="IBDocument.HIToolboxVersion">755.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">6244</string>
+			<string key="NS.object.0">6247</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>IBProxyObject</string>

diff --git a/Classes/SelectHardware.m b/Classes/SelectHardware.m
@@ -7,7 +7,7 @@
 //
 
 #import "SelectHardware.h"
-
+extern int joystickselected;
 
 @implementation SelectHardware
 
@@ -17,8 +17,9 @@ - (void)viewDidLoad {
 	controllers = [[NSMutableArray alloc] initWithObjects:
                @"iCADE",
                @"iControlPad",
+               @"MFI Controller",
                nil];
-	lastSelectedRow = 0;
+	lastSelectedRow = joystickselected;
 }
 
 - (void)viewDidUnload {
@@ -44,7 +45,21 @@ - (void)pickerView:(UIPickerView *)thePickerView didSelectRow:(NSInteger)row inC
 }
 
 - (IBAction)done:(id)sender {
-    int joystick = lastSelectedRow == 0 ? 3 : 2;
+    int joystick;
+
+    switch(lastSelectedRow)
+    {
+        case 2:
+            joystick = 4;
+            break;
+        case 0:
+            joystick = 3;
+            break;
+        default:
+            joystick = 2;
+            break;
+    }
+
 	[delegate didSelectHardware:joystick name:[controllers objectAtIndex:lastSelectedRow]];
 	//[self dismissModalViewControllerAnimated:YES];
     [self.navigationController popViewControllerAnimated:YES];

diff --git a/Classes/SettingsController-ipad.xib b/Classes/SettingsController-ipad.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6254" systemVersion="14B25" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="SettingsController">

diff --git a/Classes/SettingsController.mm b/Classes/SettingsController.mm
@@ -5,6 +5,21 @@
 //  Created by Stuart Carnie on 9/30/09.
 //  Copyright 2009 __MyCompanyName__. All rights reserved.
 //
+//  Changed by Emufr3ak on 17.11.2014
+//
+//  iUAE is free software: you may copy, redistribute
+//  and/or modify it under the terms of the GNU General Public License as
+//  published by the Free Software Foundation, either version 2 of the
+//  License, or (at your option) any later version.
+//
+//  This file is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #import "SettingsController.h"
 #import "EMUROMBrowserViewController.h"
@@ -25,6 +40,7 @@
 extern int mainMenu_showStatus;
 extern int mainMenu_ntsc;
 extern int mainMenu_stretchscreen;
+extern int joystickselected;
 
 @implementation SettingsController
 
@@ -46,7 +62,25 @@ - (void)viewDidLoad {
     stretchscreen.on = mainMenu_stretchscreen ? YES : NO;
 	status.on = mainMenu_showStatus ? YES : NO;
 	displayModeNTSC.on = mainMenu_ntsc ? YES : NO;
-    [controller setTitle:@"iCADE" forState:UIControlStateNormal];
+
+
+
+    NSString *controllername;
+
+    switch(joystickselected)
+    {
+        case 4:
+            controllername = @"MFI";
+            break;
+        case 3:
+            controllername = @"iCADE";
+            break;
+        default:
+            controllername = @"iControlPAD";
+            break;
+    }
+
+    [controller setTitle:controllername forState:UIControlStateNormal];
 
 #if DISASSEMBLER
 	resetLog.hidden = NO;
@@ -61,7 +95,7 @@ - (void)viewWillAppear:(BOOL)animated {
 #endif
 
     NSString *df0title = [[Filename objectAtIndex:0] length] == 0 ? @"Empty" : [Filename objectAtIndex:0];
-    NSString *df1title = [[Filename objectAtIndex:1] length] == 0 ? @"Empty" : [Filename objectAtIndex:0];
+    NSString *df1title = [[Filename objectAtIndex:1] length] == 0 ? @"Empty" : [Filename objectAtIndex:1];
 
     [df0 setTitle:df0title forState:UIControlStateNormal];
     [df1 setTitle:df1title forState:UIControlStateNormal];
@@ -111,6 +145,7 @@ - (void)didSelectHardware:(int)joystick name:(NSString *)name {
 
 - (void)didSelectROM:(EMUFileInfo *)fileInfo withContext:(UIButton*)sender {
 	NSString *path = [fileInfo path];
+    NSString *tst = [fileInfo fileName];
 	int df = sender.tag;
 	[sender setTitle:[fileInfo fileName] forState:UIControlStateNormal];
     [Filename replaceObjectAtIndex:df withObject:[NSMutableString stringWithString:[fileInfo fileName]]];

diff --git a/Classes/SettingsController.xib b/Classes/SettingsController.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6254" systemVersion="14B25" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="SettingsController">
@@ -22,17 +22,6 @@
             <rect key="frame" x="0.0" y="0.0" width="480" height="320"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
-                <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="4" userLabel="DF0Button">
-                    <rect key="frame" x="79" y="55" width="221" height="37"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="15"/>
-                    <state key="normal">
-                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                    </state>
-                    <connections>
-                        <action selector="selectDrive:" destination="-1" eventType="touchUpInside" id="8"/>
-                    </connections>
-                </button>
                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" text="DF0" lineBreakMode="tailTruncation" minimumFontSize="10" id="5">
                     <rect key="frame" x="20" y="55" width="42" height="21"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -168,6 +157,17 @@
                         <action selector="selectController:" destination="-1" eventType="touchUpInside" id="58"/>
                     </connections>
                 </button>
+                <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="4" userLabel="DF0Button">
+                    <rect key="frame" x="79" y="55" width="221" height="37"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="15"/>
+                    <state key="normal">
+                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                    </state>
+                    <connections>
+                        <action selector="selectDrive:" destination="-1" eventType="touchUpInside" id="8"/>
+                    </connections>
+                </button>
             </subviews>
             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
             <nil key="simulatedStatusBarMetrics"/>