Merge branch 'master' of https://github.com/open-ephys/GUI

.gitignore

@@ -60,6 +60,9 @@ cscope.out
 *.continuous
 *.events
 
+# 8. OS X related
 .DS_Store
-
-Builds/MacOSX/open-ephys.xcodeproj/project.xcworkspace/xcuserdata/ryan.xcuserdatad/UserInterfaceState.xcuserstate
+Builds/MacOSX/open-ephys.xcodeproj/*.mode1v3
+Builds/MacOSX/open-ephys.xcodeproj/*.pbxuser
+Builds/MacOSX/open-ephys.xcodeproj/xcuserdata
+Builds/MacOSX/open-ephys.xcodeproj/project.xcworkspace

Builds/MacOSX/open-ephys.xcodeproj/xcuserdata/ryan.xcuserdatad/xcschemes/open-ephys.xcscheme

-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0460"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "609761DEC9151D2CDD50270C"
-               BuildableName = "open-ephys.app"
-               BlueprintName = "open-ephys"
-               ReferencedContainer = "container:open-ephys.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "609761DEC9151D2CDD50270C"
-            BuildableName = "open-ephys.app"
-            BlueprintName = "open-ephys"
-            ReferencedContainer = "container:open-ephys.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "609761DEC9151D2CDD50270C"
-            BuildableName = "open-ephys.app"
-            BlueprintName = "open-ephys"
-            ReferencedContainer = "container:open-ephys.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "609761DEC9151D2CDD50270C"
-            BuildableName = "open-ephys.app"
-            BlueprintName = "open-ephys"
-            ReferencedContainer = "container:open-ephys.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

Builds/MacOSX/open-ephys.xcodeproj/xcuserdata/ryan.xcuserdatad/xcschemes/xcschememanagement.plist

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>open-ephys.xcscheme</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-	<key>SuppressBuildableAutocreation</key>
-	<dict>
-		<key>609761DEC9151D2CDD50270C</key>
-		<dict>
-			<key>primary</key>
-			<true/>
-		</dict>
-	</dict>
-</dict>
-</plist>

Source/Processors/FileReader.cpp

@@ -34,17 +34,6 @@ FileReader::FileReader()
 
     enabledState(false);
 
-    // check endianness of the platform
-    uint32 magic = 0x00000001;
-    uint8 black_magic = *(uint8 *)&magic;
-
-    if (black_magic > 0)
-    {
-        isLittleEndian = true;
-    } else {
-        isLittleEndian = false;
-    }
-
 }
 
 FileReader::~FileReader()
@@ -180,14 +169,14 @@ void FileReader::process(AudioSampleBuffer& buffer, MidiBuffer& events, int& nSa
 
         int16 sample = readBuffer[n];
 
-        if (!isLittleEndian) // most likely on Windows
-        {
+#ifdef JUCE_WINDOWS //-- big-endian format
             // reverse the byte order
-            sample = (((sample >> 0) & 0xff) << 8) | 
-                     (((sample >> 8) & 0xff) << 0);
-        }
+	//	float sample_f;
+	//	AudioDataConverters::convertInt16BEToFloat(&readBuffer[n], &sample_f, 1);
+
+#endif
 
-        *buffer.getSampleData(chan++, samp) = float(-sample) * getDefaultBitVolts(); // previously 0.035
+        *buffer.getSampleData(chan++, samp) = -sample * getDefaultBitVolts();
 
     }
 

Source/Processors/FileReader.h

@@ -92,8 +92,6 @@ private:
 
     String filePath;
 
-    bool isLittleEndian;
-
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(FileReader);
 
 };