diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-02-12 17:18:13 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2019-02-12 17:21:48 +0100 |
| commit | c5dcbeb160b37d8ffd70061d76eb980756fe36b4 (patch) | |
| tree | f8f57166dae4b88856faefdd93b15df0f1918b3d /scene/audio | |
| parent | bc26d0d6cdd1c28a0a243131468bf5f698dff18f (diff) | |
Scene: Ensure classes match their header filename
Also drop some unused files.
Renamed:
- `scene/2d/navigation2d.h` -> `navigation_2d.h`
- `scene/2d/screen_button.h` -> `touch_screen_button.h`
- `scene/3d/scenario_fx.h` -> `world_environment.h`
- `scene/audio/audio_player.h` -> `audio_stream_player.h`
- `scene/resources/bit_mask.h` -> `bit_map.h`
- `scene/resources/color_ramp.h` -> `gradient.h`
- `scene/resources/shape_line_2d.h` -> `line_shape_2d.h`
- `scene/resources/scene_format_text.h` -> `resource_format_text.h`
- `scene/resources/sky_box.h` -> `sky.h`
Dropped:
- `scene/resources/bounds.h`
Diffstat (limited to 'scene/audio')
| -rw-r--r-- | scene/audio/audio_stream_player.cpp (renamed from scene/audio/audio_player.cpp) | 4 | ||||
| -rw-r--r-- | scene/audio/audio_stream_player.h (renamed from scene/audio/audio_player.h) | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/scene/audio/audio_player.cpp b/scene/audio/audio_stream_player.cpp index 4eae3b04e7..e6864e2117 100644 --- a/scene/audio/audio_player.cpp +++ b/scene/audio/audio_stream_player.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* audio_player.cpp */ +/* audio_stream_player.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "audio_player.h" +#include "audio_stream_player.h" #include "core/engine.h" diff --git a/scene/audio/audio_player.h b/scene/audio/audio_stream_player.h index 2e9526c335..0f7713bf33 100644 --- a/scene/audio/audio_player.h +++ b/scene/audio/audio_stream_player.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* audio_player.h */ +/* audio_stream_player.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIOPLAYER_H -#define AUDIOPLAYER_H +#ifndef AUDIO_STREAM_PLAYER_H +#define AUDIO_STREAM_PLAYER_H #include "scene/main/node.h" #include "servers/audio/audio_stream.h" @@ -110,4 +110,5 @@ public: }; VARIANT_ENUM_CAST(AudioStreamPlayer::MixTarget) -#endif // AUDIOPLAYER_H + +#endif // AUDIO_STREAM_PLAYER_H |