summaryrefslogtreecommitdiff
path: root/Source/Core/AudioCommon
diff options
context:
space:
mode:
authorspycrab <spycrab@users.noreply.github.com>2018-04-12 14:18:04 +0200
committerspycrab <spycrab@users.noreply.github.com>2018-04-12 21:28:39 +0200
commit40bb9974f21878e64fb03d70e717cb996bf13a29 (patch)
tree1d8a9e7eea10820e5d645ad5028e506836b856de /Source/Core/AudioCommon
parentd27e85e9d70dfb41a5b8880fd3375a0ac9574f5d (diff)
Reformat all the things!
Diffstat (limited to 'Source/Core/AudioCommon')
-rw-r--r--Source/Core/AudioCommon/AlsaSoundStream.cpp5
-rw-r--r--Source/Core/AudioCommon/AlsaSoundStream.h1
-rw-r--r--Source/Core/AudioCommon/Mixer.h1
-rw-r--r--Source/Core/AudioCommon/OpenSLESStream.h1
-rw-r--r--Source/Core/AudioCommon/WaveFile.h1
5 files changed, 7 insertions, 2 deletions
diff --git a/Source/Core/AudioCommon/AlsaSoundStream.cpp b/Source/Core/AudioCommon/AlsaSoundStream.cpp
index fad5dde8b0..3d20331abd 100644
--- a/Source/Core/AudioCommon/AlsaSoundStream.cpp
+++ b/Source/Core/AudioCommon/AlsaSoundStream.cpp
@@ -186,8 +186,9 @@ bool AlsaSound::AlsaInit()
// it is probably a bad idea to try to send more than one buffer of data
if ((unsigned int)frames_to_deliver > buffer_size)
frames_to_deliver = buffer_size;
- NOTICE_LOG(AUDIO, "ALSA gave us a %ld sample \"hardware\" buffer with %d periods. Will send %d "
- "samples per fragments.",
+ NOTICE_LOG(AUDIO,
+ "ALSA gave us a %ld sample \"hardware\" buffer with %d periods. Will send %d "
+ "samples per fragments.",
buffer_size, periods, frames_to_deliver);
snd_pcm_sw_params_alloca(&swparams);
diff --git a/Source/Core/AudioCommon/AlsaSoundStream.h b/Source/Core/AudioCommon/AlsaSoundStream.h
index 7bb71531ef..8cfde375d3 100644
--- a/Source/Core/AudioCommon/AlsaSoundStream.h
+++ b/Source/Core/AudioCommon/AlsaSoundStream.h
@@ -29,6 +29,7 @@ public:
bool SetRunning(bool running) override;
static bool isValid() { return true; }
+
private:
// maximum number of frames the buffer can hold
static constexpr size_t BUFFER_SIZE_MAX = 8192;
diff --git a/Source/Core/AudioCommon/Mixer.h b/Source/Core/AudioCommon/Mixer.h
index 7359ab85e8..e2545d6be1 100644
--- a/Source/Core/AudioCommon/Mixer.h
+++ b/Source/Core/AudioCommon/Mixer.h
@@ -44,6 +44,7 @@ public:
float GetCurrentSpeed() const { return m_speed.load(); }
void UpdateSpeed(float val) { m_speed.store(val); }
+
private:
static constexpr u32 MAX_SAMPLES = 1024 * 4; // 128 ms
static constexpr u32 INDEX_MASK = MAX_SAMPLES * 2 - 1;
diff --git a/Source/Core/AudioCommon/OpenSLESStream.h b/Source/Core/AudioCommon/OpenSLESStream.h
index fb300d1614..237501c54c 100644
--- a/Source/Core/AudioCommon/OpenSLESStream.h
+++ b/Source/Core/AudioCommon/OpenSLESStream.h
@@ -17,6 +17,7 @@ public:
bool Init() override;
bool SetRunning(bool running) override { return running; }
static bool isValid() { return true; }
+
private:
std::thread thread;
Common::Event soundSyncEvent;
diff --git a/Source/Core/AudioCommon/WaveFile.h b/Source/Core/AudioCommon/WaveFile.h
index 45d074ace3..bd34046878 100644
--- a/Source/Core/AudioCommon/WaveFile.h
+++ b/Source/Core/AudioCommon/WaveFile.h
@@ -37,6 +37,7 @@ public:
void SetSkipSilence(bool skip) { skip_silence = skip; }
void AddStereoSamplesBE(const short* sample_data, u32 count, int sample_rate); // big endian
u32 GetAudioSize() const { return audio_size; }
+
private:
static constexpr size_t BUFFER_SIZE = 32 * 1024;