summaryrefslogtreecommitdiffstats
path: root/scene/resources/audio_stream_sample.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-05-14 14:29:06 +0200
committerRémi Verschelde <rverschelde@gmail.com>2020-05-14 16:54:55 +0200
commit07bc4e2f96f8f47991339654ff4ab16acc19d44f (patch)
tree43cdc7cfe8239c23065616a931de3769d2db1e86 /scene/resources/audio_stream_sample.cpp
parent0be6d925dc3c6413bce7a3ccb49631b8e4a6e67a (diff)
downloadredot-engine-07bc4e2f96f8f47991339654ff4ab16acc19d44f.tar.gz
Style: Enforce separation line between function definitions
I couldn't find a tool that enforces it, so I went the manual route: ``` find -name "thirdparty" -prune \ -o -name "*.cpp" -o -name "*.h" -o -name "*.m" -o -name "*.mm" \ -o -name "*.glsl" > files perl -0777 -pi -e 's/\n}\n([^#])/\n}\n\n\1/g' $(cat files) misc/scripts/fix_style.sh -c ``` This adds a newline after all `}` on the first column, unless they are followed by `#` (typically `#endif`). This leads to having lots of places with two lines between function/class definitions, but clang-format then fixes it as we enforce max one line of separation. This doesn't fix potential occurrences of function definitions which are indented (e.g. for a helper class defined in a .cpp), but it's better than nothing. Also can't be made to run easily on CI/hooks so we'll have to be careful with new code. Part of #33027.
Diffstat (limited to 'scene/resources/audio_stream_sample.cpp')
-rw-r--r--scene/resources/audio_stream_sample.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/scene/resources/audio_stream_sample.cpp b/scene/resources/audio_stream_sample.cpp
index b6608b47d0..dafcf12183 100644
--- a/scene/resources/audio_stream_sample.cpp
+++ b/scene/resources/audio_stream_sample.cpp
@@ -70,6 +70,7 @@ int AudioStreamPlaybackSample::get_loop_count() const {
float AudioStreamPlaybackSample::get_playback_position() const {
return float(offset >> MIX_FRAC_BITS) / base->mix_rate;
}
+
void AudioStreamPlaybackSample::seek(float p_time) {
if (base->format == AudioStreamSample::FORMAT_IMA_ADPCM)
return; //no seeking in ima-adpcm
@@ -404,6 +405,7 @@ AudioStreamSample::Format AudioStreamSample::get_format() const {
void AudioStreamSample::set_loop_mode(LoopMode p_loop_mode) {
loop_mode = p_loop_mode;
}
+
AudioStreamSample::LoopMode AudioStreamSample::get_loop_mode() const {
return loop_mode;
}
@@ -411,6 +413,7 @@ AudioStreamSample::LoopMode AudioStreamSample::get_loop_mode() const {
void AudioStreamSample::set_loop_begin(int p_frame) {
loop_begin = p_frame;
}
+
int AudioStreamSample::get_loop_begin() const {
return loop_begin;
}
@@ -418,6 +421,7 @@ int AudioStreamSample::get_loop_begin() const {
void AudioStreamSample::set_loop_end(int p_frame) {
loop_end = p_frame;
}
+
int AudioStreamSample::get_loop_end() const {
return loop_end;
}
@@ -426,12 +430,15 @@ void AudioStreamSample::set_mix_rate(int p_hz) {
ERR_FAIL_COND(p_hz == 0);
mix_rate = p_hz;
}
+
int AudioStreamSample::get_mix_rate() const {
return mix_rate;
}
+
void AudioStreamSample::set_stereo(bool p_enable) {
stereo = p_enable;
}
+
bool AudioStreamSample::is_stereo() const {
return stereo;
}
@@ -478,6 +485,7 @@ void AudioStreamSample::set_data(const Vector<uint8_t> &p_data) {
AudioServer::get_singleton()->unlock();
}
+
Vector<uint8_t> AudioStreamSample::get_data() const {
Vector<uint8_t> pv;