Fix AUX channels getting incorrect type

Builds/VisualStudio2012/open-ephys.vcxproj

@@ -87,7 +87,7 @@
       <Optimization>Disabled</Optimization>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;../../Resources/windows-libs/HDF5/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DEBUG_EMULATE_HEADSTAGES=2;WIN32;_WINDOWS;DEBUG;_DEBUG;NOMINMAX;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=0.3.2;JUCE_APP_VERSION_HEX=0x302;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DEBUG_EMULATE_HEADSTAGES=3;WIN32;_WINDOWS;DEBUG;_DEBUG;NOMINMAX;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=0.3.2;JUCE_APP_VERSION_HEX=0x302;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader />

Source/Processors/DataThreads/RHD2000Thread.cpp

@@ -856,7 +856,12 @@ void RHD2000Thread::setDefaultChannelNamesAndType()
                 originalChannelNumber.add(k);
 
             }
-            for (int k = 0; k < 3; k++)
+        }
+    }
+	//Aux channels
+	for (int i = 0; i < MAX_NUM_DATA_STREAMS; i++)
+    {
+		for (int k = 0; k < 3; k++)
             {
 
                 type.add(AUX_CHANNEL);
@@ -881,11 +886,9 @@ void RHD2000Thread::setDefaultChannelNamesAndType()
 
                 stream.add(i);
                 originalChannelNumber.add(numChannelsPerDataStream[i]+k);
-
             }
-        }
-    }
-
+	}
+	//ADC channels
     if (acquireAdcChannels)
     {
         for (int k = 0; k < 8; k++)