#80 fixed a few small issues in 10.9 version after cleanup

Wouter1 · Jul 11, 2016 · 67ee271 · 67ee271
1 parent 7bf2323
commit 67ee271
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 12 deletions.
diff --git a/src/EMUUSBAudio.xcodeproj/project.pbxproj b/src/EMUUSBAudio.xcodeproj/project.pbxproj
@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		6C0C68C91D340977002B242E /* USB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6C0C68C81D340977002B242E /* USB.cpp */; settings = {ASSET_TAGS = (); }; };
+		6C0C68C91D340977002B242E /* USB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6C0C68C81D340977002B242E /* USB.cpp */; };
 		6C2C070819E4559800F1FD56 /* EMUUSBAudioDevice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6C2C070619E4559800F1FD56 /* EMUUSBAudioDevice.cpp */; };
 		6C2C070919E4559800F1FD56 /* EMUUSBAudioDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C2C070719E4559800F1FD56 /* EMUUSBAudioDevice.h */; };
 		6C2C070C19E4562800F1FD56 /* EMUUSBAudioEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6C2C070A19E4562800F1FD56 /* EMUUSBAudioEngine.cpp */; };
@@ -455,16 +455,16 @@
 				CREATE_INFOPLIST_SECTION_IN_BINARY = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "EMUUSBAudio/EMUUSBAudio-Prefix.pch";
-				INFOPLIST_FILE = "EMUUSBAudio/EMUUSBAudio-Info-11.plist";
+				INFOPLIST_FILE = "EMUUSBAudio/EMUUSBAudio-Info.plist";
 				INFOPLIST_PREPROCESS = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				MODULE_NAME = com.emu.driver.EMUUSBAudio;
 				MODULE_START = 0;
 				MODULE_STOP = 0;
 				MODULE_VERSION = 1.0.0d1;
 				"OTHER_CFLAGS[arch=*]" = "-DDEBUGLOGGING";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx10.11;
+				SDKROOT = macosx10.9;
 				WRAPPER_EXTENSION = kext;
 			};
 			name = Debug;
@@ -477,15 +477,15 @@
 				CREATE_INFOPLIST_SECTION_IN_BINARY = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "EMUUSBAudio/EMUUSBAudio-Prefix.pch";
-				INFOPLIST_FILE = "EMUUSBAudio/EMUUSBAudio-Info-11.plist";
+				INFOPLIST_FILE = "EMUUSBAudio/EMUUSBAudio-Info.plist";
 				INFOPLIST_PREPROCESS = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				MODULE_NAME = com.emu.driver.EMUUSBAudio;
 				MODULE_START = 0;
 				MODULE_STOP = 0;
 				MODULE_VERSION = 1.0.0d1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx10.11;
+				SDKROOT = macosx10.9;
 				WRAPPER_EXTENSION = kext;
 			};
 			name = Release;

diff --git a/src/IOUSBDevice.cpp b/src/IOUSBDevice.cpp
@@ -31,7 +31,7 @@ IOReturn IOUSBDevice1::devRequestSampleRate(UInt32 inSampleRate, UInt16 endpoint
     return DeviceRequest (&devReq);
 }
 
-UInt64 getFrameNumber() {
+UInt64 IOUSBDevice1::getFrameNumber() {
     return GetBus()->GetFrameNumber();
 }
 

diff --git a/src/IOUSBDevice.h b/src/IOUSBDevice.h
@@ -23,7 +23,7 @@
 
 class IOUSBDevice1 : public IOUSBDevice {
 public:
-    inline bool isHighSpeed();
+    bool isHighSpeed();
 
     /*!
      * set the sample rate to the device.

diff --git a/src/IOUSBInterface.cpp b/src/IOUSBInterface.cpp
@@ -9,9 +9,8 @@
 
 #ifdef HAVE_OLD_USB_INTERFACE
 /******************** 10.9 *********************/
-
+#include "IOUSBInterface.h"
 #include <IOKit/usb/IOUSBInterface.h>
-#include "IOUSBDevice.h"
 #include "USB.h"
 
 

diff --git a/src/IOUSBInterface.h b/src/IOUSBInterface.h
@@ -67,7 +67,7 @@ class IOUSBInterface1: public IOUSBInterface {
                   UInt16                  index,
                   UInt16                  length,
                         IOMemoryDescriptor *    data) ;
-
+};
 
 #else
 

diff --git a/v11/EMUUSBAudio.kext/Contents/MacOS/EMUUSBAudio b/v11/EMUUSBAudio.kext/Contents/MacOS/EMUUSBAudio
diff --git a/v9/EMUUSBAudio.kext/Contents/MacOS/EMUUSBAudio b/v9/EMUUSBAudio.kext/Contents/MacOS/EMUUSBAudio
-Original file line number
+Diff line change
@@ Expand Up / @@ -67,7 +67,7 @@ class IOUSBInterface1: public IOUSBInterface { @@
                       UInt16                  index,
                       UInt16                  length,
                             IOMemoryDescriptor *    data) ;
+    };
     #else
@@ Expand Down @@