[Audio] Move settings id in to SettingsID.h

Android/jni/Project64-audio/Project64-audio.mk

@@ -15,7 +15,7 @@ LOCAL_C_INCLUDES :=
 
 LOCAL_SRC_FILES :=               \
     $(SRCDIR)/AudioSettings.cpp  \
-    $(SRCDIR)/Main.cpp           \
+    $(SRCDIR)/AudioMain.cpp      \
     $(SRCDIR)/trace.cpp          \
 
 LOCAL_CFLAGS := $(COMMON_CFLAGS)

Source/Project64-audio/AudioMain.cpp

@@ -24,6 +24,7 @@
 #include "AudioSettings.h"
 #include "trace.h"
 #include "AudioMain.h"
+#include "SettingsID.h"
 
 #ifdef ANDROID
 typedef struct threadLock_

Source/Project64-audio/AudioSettings.cpp

@@ -8,6 +8,7 @@
 * GNU/GPLv2 http://www.gnu.org/licenses/gpl-2.0.html                        *
 *                                                                           *
 ****************************************************************************/
+#include "SettingsID.h"
 #include "AudioSettings.h"
 #include "trace.h"
 #include "AudioMain.h"

Source/Project64-audio/AudioSettings.h

@@ -11,15 +11,4 @@
 #pragma once
 #include <Settings/Settings.h>
 
-enum AudioSettingID
-{
-    Output_SwapChannels,
-    Output_DefaultFrequency,
-    Buffer_PrimarySize,
-    Buffer_SecondarySize,
-    Buffer_SecondaryNbr,
-    Logging_LogAudioInitShutdown,
-    Logging_LogAudioInterface,
-};
-
 void SetupAudioSettings(void);

Source/Project64-audio/Project64-audio.vcxproj

@@ -44,6 +44,7 @@
     <ClInclude Include="AudioMain.h" />
     <ClInclude Include="Audio_1.1.h" />
     <ClInclude Include="AudioSettings.h" />
+    <ClInclude Include="SettingsID.h" />
     <ClInclude Include="trace.h" />
     <ClInclude Include="Version.h" />
   </ItemGroup>

Source/Project64-audio/Project64-audio.vcxproj.filters

@@ -41,5 +41,8 @@
     <ClInclude Include="AudioMain.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="SettingsID.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

Source/Project64-audio/SettingsID.h

@@ -0,0 +1,23 @@
+/****************************************************************************
+*                                                                           *
+* Project64-audio - A Nintendo 64 audio plugin.                             *
+* http://www.pj64-emu.com/                                                  *
+* Copyright (C) 2017 Project64. All rights reserved.                        *
+*                                                                           *
+* License:                                                                  *
+* GNU/GPLv2 http://www.gnu.org/licenses/gpl-2.0.html                        *
+*                                                                           *
+****************************************************************************/
+#pragma once
+#include <Settings/Settings.h>
+
+enum
+{
+    Logging_LogAudioInitShutdown,
+    Logging_LogAudioInterface,
+    Output_SwapChannels,
+    Output_DefaultFrequency,
+    Buffer_PrimarySize,
+    Buffer_SecondarySize,
+    Buffer_SecondaryNbr,
+};

Source/Project64-audio/trace.cpp

@@ -12,6 +12,7 @@
 #include <Settings/Settings.h>
 #include <Common/path.h>
 #include <Common/LogClass.h>
+#include "AudioSettings.h"
 
 #ifdef ANDROID
 #include <android/log.h>

Source/Project64-audio/trace.h

@@ -21,3 +21,4 @@ enum TraceModuleAndroidAudio
 };
 
 void SetupTrace(void);
+void StartTrace(void);