summaryrefslogtreecommitdiff
path: root/Source/Core/AudioCommon
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2014-02-17 08:55:19 +0100
committerPierre Bourdon <delroth@gmail.com>2014-02-17 08:55:19 +0100
commit73691a8587e5f09ef138384d2ff97e4059ba9380 (patch)
tree1b5509192851cdd3e6c09251c0051b33d8d3ca15 /Source/Core/AudioCommon
parenta8ca2c6cc2ed6177bd26b6c022b919179a8ce37a (diff)
parent3fd87a7636ff434118a5d7f7334550be8db55c0b (diff)
Merge pull request #86 from lioncash/vertical-alignments2-electric-boogaloo
Second and final pass of clearing out tabs.
Diffstat (limited to 'Source/Core/AudioCommon')
-rw-r--r--Source/Core/AudioCommon/OpenALStream.h20
-rw-r--r--Source/Core/AudioCommon/OpenSLESStream.cpp2
-rw-r--r--Source/Core/AudioCommon/XAudio2Stream.cpp12
-rw-r--r--Source/Core/AudioCommon/XAudio2_7Stream.cpp12
-rw-r--r--Source/Core/AudioCommon/aldlist.cpp2
-rw-r--r--Source/Core/AudioCommon/aldlist.h12
-rw-r--r--Source/Core/AudioCommon/stdafx.h2
7 files changed, 31 insertions, 31 deletions
diff --git a/Source/Core/AudioCommon/OpenALStream.h b/Source/Core/AudioCommon/OpenALStream.h
index 2667f90ac1..6653e33684 100644
--- a/Source/Core/AudioCommon/OpenALStream.h
+++ b/Source/Core/AudioCommon/OpenALStream.h
@@ -28,16 +28,16 @@
#include <soundtouch/STTypes.h>
// 16 bit Stereo
-#define SFX_MAX_SOURCE 1
-#define OAL_MAX_BUFFERS 32
-#define OAL_MAX_SAMPLES 256
-#define STEREO_CHANNELS 2
-#define SURROUND_CHANNELS 6 // number of channels in surround mode
-#define SIZE_SHORT 2
-#define SIZE_FLOAT 4 // size of a float in bytes
-#define FRAME_STEREO_SHORT STEREO_CHANNELS * SIZE_SHORT
-#define FRAME_STEREO_FLOAT STEREO_CHANNELS * SIZE_FLOAT
-#define FRAME_SURROUND_FLOAT SURROUND_CHANNELS * SIZE_FLOAT
+#define SFX_MAX_SOURCE 1
+#define OAL_MAX_BUFFERS 32
+#define OAL_MAX_SAMPLES 256
+#define STEREO_CHANNELS 2
+#define SURROUND_CHANNELS 6 // number of channels in surround mode
+#define SIZE_SHORT 2
+#define SIZE_FLOAT 4 // size of a float in bytes
+#define FRAME_STEREO_SHORT STEREO_CHANNELS * SIZE_SHORT
+#define FRAME_STEREO_FLOAT STEREO_CHANNELS * SIZE_FLOAT
+#define FRAME_SURROUND_FLOAT SURROUND_CHANNELS * SIZE_FLOAT
#endif
class OpenALStream: public SoundStream
diff --git a/Source/Core/AudioCommon/OpenSLESStream.cpp b/Source/Core/AudioCommon/OpenSLESStream.cpp
index 67e77a4d86..ad6b3edece 100644
--- a/Source/Core/AudioCommon/OpenSLESStream.cpp
+++ b/Source/Core/AudioCommon/OpenSLESStream.cpp
@@ -44,7 +44,7 @@ static void bqPlayerCallback(SLAndroidSimpleBufferQueueItf bq, void *context) {
_assert_msg_(AUDIO, SL_RESULT_SUCCESS == result, "Couldn't enqueue audio stream.");
- curBuffer ^= 1; // Switch buffer
+ curBuffer ^= 1; // Switch buffer
// Render to the fresh buffer
g_mixer->Mix(reinterpret_cast<short *>(buffer[curBuffer]), BUFFER_SIZE_IN_SAMPLES);
}
diff --git a/Source/Core/AudioCommon/XAudio2Stream.cpp b/Source/Core/AudioCommon/XAudio2Stream.cpp
index cbc860bda3..4e9bade618 100644
--- a/Source/Core/AudioCommon/XAudio2Stream.cpp
+++ b/Source/Core/AudioCommon/XAudio2Stream.cpp
@@ -217,11 +217,11 @@ void XAudio2::Update()
//static int xi = 0;
//if (100000 == ++xi)
//{
- // xi = 0;
- // XAUDIO2_PERFORMANCE_DATA perfData;
- // pXAudio2->GetPerformanceData(&perfData);
- // NOTICE_LOG(DSPHLE, "XAudio2 latency (samples): %i", perfData.CurrentLatencyInSamples);
- // NOTICE_LOG(DSPHLE, "XAudio2 total glitches: %i", perfData.GlitchesSinceEngineStarted);
+ // xi = 0;
+ // XAUDIO2_PERFORMANCE_DATA perfData;
+ // pXAudio2->GetPerformanceData(&perfData);
+ // NOTICE_LOG(DSPHLE, "XAudio2 latency (samples): %i", perfData.CurrentLatencyInSamples);
+ // NOTICE_LOG(DSPHLE, "XAudio2 total glitches: %i", perfData.GlitchesSinceEngineStarted);
//}
}
@@ -250,7 +250,7 @@ void XAudio2::Stop()
m_mastering_voice = nullptr;
}
- m_xaudio2.reset(); // release interface
+ m_xaudio2.reset(); // release interface
if (m_xaudio2_dll)
{
diff --git a/Source/Core/AudioCommon/XAudio2_7Stream.cpp b/Source/Core/AudioCommon/XAudio2_7Stream.cpp
index c3ddf1b039..d03953fc57 100644
--- a/Source/Core/AudioCommon/XAudio2_7Stream.cpp
+++ b/Source/Core/AudioCommon/XAudio2_7Stream.cpp
@@ -218,11 +218,11 @@ void XAudio2_7::Update()
//static int xi = 0;
//if (100000 == ++xi)
//{
- // xi = 0;
- // XAUDIO2_PERFORMANCE_DATA perfData;
- // pXAudio2->GetPerformanceData(&perfData);
- // NOTICE_LOG(DSPHLE, "XAudio2_7 latency (samples): %i", perfData.CurrentLatencyInSamples);
- // NOTICE_LOG(DSPHLE, "XAudio2_7 total glitches: %i", perfData.GlitchesSinceEngineStarted);
+ // xi = 0;
+ // XAUDIO2_PERFORMANCE_DATA perfData;
+ // pXAudio2->GetPerformanceData(&perfData);
+ // NOTICE_LOG(DSPHLE, "XAudio2_7 latency (samples): %i", perfData.CurrentLatencyInSamples);
+ // NOTICE_LOG(DSPHLE, "XAudio2_7 total glitches: %i", perfData.GlitchesSinceEngineStarted);
//}
}
@@ -251,7 +251,7 @@ void XAudio2_7::Stop()
m_mastering_voice = nullptr;
}
- m_xaudio2.reset(); // release interface
+ m_xaudio2.reset(); // release interface
if (m_xaudio2_dll)
{
diff --git a/Source/Core/AudioCommon/aldlist.cpp b/Source/Core/AudioCommon/aldlist.cpp
index 7499ae165d..0cb33a8ad2 100644
--- a/Source/Core/AudioCommon/aldlist.cpp
+++ b/Source/Core/AudioCommon/aldlist.cpp
@@ -41,7 +41,7 @@
*/
ALDeviceList::ALDeviceList()
{
- ALDEVICEINFO ALDeviceInfo;
+ ALDEVICEINFO ALDeviceInfo;
char *devices;
s32 index;
const char *defaultDeviceName = NULL;
diff --git a/Source/Core/AudioCommon/aldlist.h b/Source/Core/AudioCommon/aldlist.h
index 29d742a98b..7ea071d12e 100644
--- a/Source/Core/AudioCommon/aldlist.h
+++ b/Source/Core/AudioCommon/aldlist.h
@@ -12,12 +12,12 @@ using namespace std;
typedef struct
{
- string strDeviceName;
- s32 iMajorVersion;
- s32 iMinorVersion;
- u32 uiSourceCount;
- vector<string> *pvstrExtensions;
- bool bSelected;
+ string strDeviceName;
+ s32 iMajorVersion;
+ s32 iMinorVersion;
+ u32 uiSourceCount;
+ vector<string>* pvstrExtensions;
+ bool bSelected;
} ALDEVICEINFO, *LPALDEVICEINFO;
class ALDeviceList
diff --git a/Source/Core/AudioCommon/stdafx.h b/Source/Core/AudioCommon/stdafx.h
index 9cd419573c..e28b312ed0 100644
--- a/Source/Core/AudioCommon/stdafx.h
+++ b/Source/Core/AudioCommon/stdafx.h
@@ -11,7 +11,7 @@
#define _WIN32_WINNT 0x602
#endif
*/
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
#include <algorithm>
#include <functional>