diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-01-26 11:48:42 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-01-26 11:48:42 +0100 |
| commit | d3dfcc5977ad3d08db1c7e1a56c0ea9a12856697 (patch) | |
| tree | ef2b47ec747bea3fd301e39b7c1a26f0896d317a | |
| parent | 3bbf4abfaa51848b6d18ad9f4c559973faee3cef (diff) | |
| parent | c8925827790b28a9a3a5013ce094514db17b96b7 (diff) | |
| download | redot-engine-d3dfcc5977ad3d08db1c7e1a56c0ea9a12856697.tar.gz | |
Merge pull request #87555 from EIREXE/video_player_unfunny
Replace internal usage of ImageTexture in VideoStreamPlayer for Texture2D
| -rw-r--r-- | scene/gui/video_stream_player.cpp | 1 | ||||
| -rw-r--r-- | scene/gui/video_stream_player.h | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/scene/gui/video_stream_player.cpp b/scene/gui/video_stream_player.cpp index 41a210e180..687a9e46a0 100644 --- a/scene/gui/video_stream_player.cpp +++ b/scene/gui/video_stream_player.cpp @@ -31,7 +31,6 @@ #include "video_stream_player.h" #include "core/os/os.h" -#include "scene/resources/image_texture.h" #include "scene/scene_string_names.h" #include "servers/audio_server.h" diff --git a/scene/gui/video_stream_player.h b/scene/gui/video_stream_player.h index 0b83608f0b..c173c8bfa3 100644 --- a/scene/gui/video_stream_player.h +++ b/scene/gui/video_stream_player.h @@ -36,8 +36,6 @@ #include "servers/audio/audio_rb_resampler.h" #include "servers/audio_server.h" -class ImageTexture; - class VideoStreamPlayer : public Control { GDCLASS(VideoStreamPlayer, Control); @@ -54,7 +52,7 @@ class VideoStreamPlayer : public Control { RID stream_rid; - Ref<ImageTexture> texture; + Ref<Texture2D> texture; AudioRBResampler resampler; Vector<AudioFrame> mix_buffer; |