asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #87555 from EIREXE/video_player_unfunny

Browse source 
Replace internal usage of ImageTexture in VideoStreamPlayer for Texture2D
This commit is contained in:
Rémi Verschelde 2024-01-26 11:48:42 +01:00
commit d3dfcc5977
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scene/gui/video_stream_player.cpp
View file

@ -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"

4
scene/gui/video_stream_player.h
View file

@ -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;