Browse Source

Merge pull request #87555 from EIREXE/video_player_unfunny

Replace internal usage of ImageTexture in VideoStreamPlayer for Texture2D
Rémi Verschelde 1 year ago
parent
commit
d3dfcc5977
2 changed files with 1 additions and 4 deletions
  1. 0 1
      scene/gui/video_stream_player.cpp
  2. 1 3
      scene/gui/video_stream_player.h

+ 0 - 1
scene/gui/video_stream_player.cpp

@@ -31,7 +31,6 @@
 #include "video_stream_player.h"
 #include "video_stream_player.h"
 
 
 #include "core/os/os.h"
 #include "core/os/os.h"
-#include "scene/resources/image_texture.h"
 #include "scene/scene_string_names.h"
 #include "scene/scene_string_names.h"
 #include "servers/audio_server.h"
 #include "servers/audio_server.h"
 
 

+ 1 - 3
scene/gui/video_stream_player.h

@@ -36,8 +36,6 @@
 #include "servers/audio/audio_rb_resampler.h"
 #include "servers/audio/audio_rb_resampler.h"
 #include "servers/audio_server.h"
 #include "servers/audio_server.h"
 
 
-class ImageTexture;
-
 class VideoStreamPlayer : public Control {
 class VideoStreamPlayer : public Control {
 	GDCLASS(VideoStreamPlayer, Control);
 	GDCLASS(VideoStreamPlayer, Control);
 
 
@@ -54,7 +52,7 @@ class VideoStreamPlayer : public Control {
 
 
 	RID stream_rid;
 	RID stream_rid;
 
 
-	Ref<ImageTexture> texture;
+	Ref<Texture2D> texture;
 
 
 	AudioRBResampler resampler;
 	AudioRBResampler resampler;
 	Vector<AudioFrame> mix_buffer;
 	Vector<AudioFrame> mix_buffer;