diff options
| author | lioncash <mathew1800@gmail.com> | 2014-02-10 13:54:46 -0500 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-02-10 18:07:16 -0500 |
| commit | d2038049f51192fbb55fbde2fc08128bacfb7707 (patch) | |
| tree | 2f352e13e3d5868db072f1e75d611a90e938d0cf /Source/Core/AudioCommon | |
| parent | a0a65a2906af132f6da04cf552812aac6ac5f20a (diff) | |
Replace all include guard ifdefs with "#pragma once"
Diffstat (limited to 'Source/Core/AudioCommon')
| -rw-r--r-- | Source/Core/AudioCommon/AOSoundStream.h | 5 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/AlsaSoundStream.h | 6 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/AudioCommon.h | 5 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/CoreAudioSoundStream.h | 7 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/DPL2Decoder.h | 5 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/DSoundStream.h | 5 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/Mixer.h | 5 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/NullSoundStream.h | 5 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/OpenALStream.h | 5 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/OpenSLESStream.h | 5 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/PulseAudioStream.h | 5 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/SoundStream.h | 5 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/WaveFile.h | 5 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/aldlist.h | 5 |
14 files changed, 15 insertions, 58 deletions
diff --git a/Source/Core/AudioCommon/AOSoundStream.h b/Source/Core/AudioCommon/AOSoundStream.h index 1eb762492c..530108479c 100644 --- a/Source/Core/AudioCommon/AOSoundStream.h +++ b/Source/Core/AudioCommon/AOSoundStream.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _AOSOUNDSTREAM_H_ -#define _AOSOUNDSTREAM_H_ +#pragma once #include "SoundStream.h" #include "Thread.h" @@ -53,5 +52,3 @@ public: AOSound(CMixer *mixer) : SoundStream(mixer) {} #endif }; - -#endif //_AOSOUNDSTREAM_H_ diff --git a/Source/Core/AudioCommon/AlsaSoundStream.h b/Source/Core/AudioCommon/AlsaSoundStream.h index 56ab4176b9..defa3c408a 100644 --- a/Source/Core/AudioCommon/AlsaSoundStream.h +++ b/Source/Core/AudioCommon/AlsaSoundStream.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _ALSA_SOUND_STREAM_H -#define _ALSA_SOUND_STREAM_H +#pragma once #if defined(HAVE_ALSA) && HAVE_ALSA #include <alsa/asoundlib.h> @@ -52,6 +51,3 @@ public: AlsaSound(CMixer *mixer) : SoundStream(mixer) {} #endif }; - -#endif - diff --git a/Source/Core/AudioCommon/AudioCommon.h b/Source/Core/AudioCommon/AudioCommon.h index 9c49293a48..f1aece0b9c 100644 --- a/Source/Core/AudioCommon/AudioCommon.h +++ b/Source/Core/AudioCommon/AudioCommon.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _AUDIO_COMMON_H_ -#define _AUDIO_COMMON_H_ +#pragma once #include "Common.h" #include "SoundStream.h" @@ -47,5 +46,3 @@ namespace AudioCommon void PauseAndLock(bool doLock, bool unpauseOnUnlock=true); void UpdateSoundStream(); } - -#endif // _AUDIO_COMMON_H_ diff --git a/Source/Core/AudioCommon/CoreAudioSoundStream.h b/Source/Core/AudioCommon/CoreAudioSoundStream.h index 27d8c62f7d..5ebbbb945c 100644 --- a/Source/Core/AudioCommon/CoreAudioSoundStream.h +++ b/Source/Core/AudioCommon/CoreAudioSoundStream.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _COREAUDIO_SOUND_STREAM_H -#define _COREAUDIO_SOUND_STREAM_H +#pragma once #ifdef __APPLE__ #include <AudioUnit/AudioUnit.h> @@ -34,7 +33,7 @@ public: private: AudioUnit audioUnit; - int m_volume; + int m_volume; static OSStatus callback(void *inRefCon, AudioUnitRenderActionFlags *ioActionFlags, @@ -46,5 +45,3 @@ public: CoreAudioSound(CMixer *mixer) : SoundStream(mixer) {} #endif }; - -#endif diff --git a/Source/Core/AudioCommon/DPL2Decoder.h b/Source/Core/AudioCommon/DPL2Decoder.h index 8252918de3..e89795482b 100644 --- a/Source/Core/AudioCommon/DPL2Decoder.h +++ b/Source/Core/AudioCommon/DPL2Decoder.h @@ -2,10 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _DPL2DECODER_H_ -#define _DPL2DECODER_H_ +#pragma once void dpl2decode(float *samples, int numsamples, float *out); void dpl2reset(); - -#endif // _DPL2DECODER_H_ diff --git a/Source/Core/AudioCommon/DSoundStream.h b/Source/Core/AudioCommon/DSoundStream.h index a872e79181..def27babb5 100644 --- a/Source/Core/AudioCommon/DSoundStream.h +++ b/Source/Core/AudioCommon/DSoundStream.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _DSOUNDSTREAM_H_ -#define _DSOUNDSTREAM_H_ +#pragma once #include "SoundStream.h" #include "Thread.h" @@ -76,5 +75,3 @@ public: {} #endif }; - -#endif //_DSOUNDSTREAM_H_ diff --git a/Source/Core/AudioCommon/Mixer.h b/Source/Core/AudioCommon/Mixer.h index 991a2f9149..6b2c4b95f3 100644 --- a/Source/Core/AudioCommon/Mixer.h +++ b/Source/Core/AudioCommon/Mixer.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _MIXER_H_ -#define _MIXER_H_ +#pragma once #include "WaveFile.h" #include "StdMutex.h" @@ -106,5 +105,3 @@ protected: private: }; - -#endif // _MIXER_H_ diff --git a/Source/Core/AudioCommon/NullSoundStream.h b/Source/Core/AudioCommon/NullSoundStream.h index aade06b9ac..bcc96a9151 100644 --- a/Source/Core/AudioCommon/NullSoundStream.h +++ b/Source/Core/AudioCommon/NullSoundStream.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _NULLSOUNDSTREAM_H_ -#define _NULLSOUNDSTREAM_H_ +#pragma once #include <stdlib.h> #include "SoundStream.h" @@ -31,5 +30,3 @@ public: virtual bool usesMixer() const { return true; } virtual void Update(); }; - -#endif //_NULLSOUNDSTREAM_H_ diff --git a/Source/Core/AudioCommon/OpenALStream.h b/Source/Core/AudioCommon/OpenALStream.h index bccf3bd824..2667f90ac1 100644 --- a/Source/Core/AudioCommon/OpenALStream.h +++ b/Source/Core/AudioCommon/OpenALStream.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _OPENALSTREAM_H_ -#define _OPENALSTREAM_H_ +#pragma once #include "SoundStream.h" #include "Thread.h" @@ -79,5 +78,3 @@ public: {} #endif // HAVE_OPENAL }; - -#endif // OPENALSTREAM diff --git a/Source/Core/AudioCommon/OpenSLESStream.h b/Source/Core/AudioCommon/OpenSLESStream.h index 839b5dc4b9..a75aab59f9 100644 --- a/Source/Core/AudioCommon/OpenSLESStream.h +++ b/Source/Core/AudioCommon/OpenSLESStream.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _OPENSLSTREAM_H_ -#define _OPENSLSTREAM_H_ +#pragma once #include "Thread.h" #include "SoundStream.h" @@ -31,5 +30,3 @@ public: OpenSLESStream(CMixer *mixer, void *hWnd = NULL): SoundStream(mixer) {} #endif // HAVE_OPENSL }; - -#endif diff --git a/Source/Core/AudioCommon/PulseAudioStream.h b/Source/Core/AudioCommon/PulseAudioStream.h index 3164a4ee94..c9ccfb80fa 100644 --- a/Source/Core/AudioCommon/PulseAudioStream.h +++ b/Source/Core/AudioCommon/PulseAudioStream.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _PULSE_AUDIO_STREAM_H -#define _PULSE_AUDIO_STREAM_H +#pragma once #if defined(HAVE_PULSEAUDIO) && HAVE_PULSEAUDIO #include <pulse/pulseaudio.h> @@ -61,5 +60,3 @@ public: PulseAudio(CMixer *mixer) : SoundStream(mixer) {} #endif }; - -#endif diff --git a/Source/Core/AudioCommon/SoundStream.h b/Source/Core/AudioCommon/SoundStream.h index ac2ac6bbb2..dd130e814a 100644 --- a/Source/Core/AudioCommon/SoundStream.h +++ b/Source/Core/AudioCommon/SoundStream.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _SOUNDSTREAM_H_ -#define _SOUNDSTREAM_H_ +#pragma once #include "Common.h" #include "Mixer.h" @@ -55,5 +54,3 @@ public: } } }; - -#endif // _SOUNDSTREAM_H_ diff --git a/Source/Core/AudioCommon/WaveFile.h b/Source/Core/AudioCommon/WaveFile.h index c0ccd8136b..e96f64ab5d 100644 --- a/Source/Core/AudioCommon/WaveFile.h +++ b/Source/Core/AudioCommon/WaveFile.h @@ -12,8 +12,7 @@ // If Stop is not called when it destructs, the destructor will call Stop(). // --------------------------------------------------------------------------------- -#ifndef _WAVEFILE_H_ -#define _WAVEFILE_H_ +#pragma once #include "FileUtil.h" @@ -41,5 +40,3 @@ public: void AddStereoSamplesBE(const short *sample_data, u32 count); // big endian u32 GetAudioSize() const { return audio_size; } }; - -#endif // _WAVEFILE_H_ diff --git a/Source/Core/AudioCommon/aldlist.h b/Source/Core/AudioCommon/aldlist.h index 645b759660..29d742a98b 100644 --- a/Source/Core/AudioCommon/aldlist.h +++ b/Source/Core/AudioCommon/aldlist.h @@ -1,5 +1,4 @@ -#ifndef ALDEVICELIST_H -#define ALDEVICELIST_H +#pragma once #include "CommonTypes.h" #ifdef _WIN32 @@ -47,5 +46,3 @@ public: private: u32 GetMaxNumSources(); }; - -#endif // ALDEVICELIST_H |
