From 07bc4e2f96f8f47991339654ff4ab16acc19d44f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 14 May 2020 14:29:06 +0200 Subject: 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. --- scene/audio/audio_stream_player.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'scene/audio') diff --git a/scene/audio/audio_stream_player.cpp b/scene/audio/audio_stream_player.cpp index 6cd4914519..660d148516 100644 --- a/scene/audio/audio_stream_player.cpp +++ b/scene/audio/audio_stream_player.cpp @@ -219,6 +219,7 @@ Ref AudioStreamPlayer::get_stream() const { void AudioStreamPlayer::set_volume_db(float p_volume) { volume_db = p_volume; } + float AudioStreamPlayer::get_volume_db() const { return volume_db; } @@ -227,6 +228,7 @@ void AudioStreamPlayer::set_pitch_scale(float p_pitch_scale) { ERR_FAIL_COND(p_pitch_scale <= 0.0); pitch_scale = p_pitch_scale; } + float AudioStreamPlayer::get_pitch_scale() const { return pitch_scale; } @@ -276,6 +278,7 @@ void AudioStreamPlayer::set_bus(const StringName &p_bus) { bus = p_bus; AudioServer::get_singleton()->unlock(); } + StringName AudioStreamPlayer::get_bus() const { for (int i = 0; i < AudioServer::get_singleton()->get_bus_count(); i++) { if (AudioServer::get_singleton()->get_bus_name(i) == bus) { @@ -288,6 +291,7 @@ StringName AudioStreamPlayer::get_bus() const { void AudioStreamPlayer::set_autoplay(bool p_enable) { autoplay = p_enable; } + bool AudioStreamPlayer::is_autoplay_enabled() { return autoplay; } @@ -306,6 +310,7 @@ void AudioStreamPlayer::_set_playing(bool p_enable) { else stop(); } + bool AudioStreamPlayer::_is_active() const { return active; } -- cgit v1.2.3