diff options
Diffstat (limited to 'scene/gui/video_player.h')
| -rw-r--r-- | scene/gui/video_player.h | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/scene/gui/video_player.h b/scene/gui/video_player.h index 168ea805b1..4f2894cdc2 100644 --- a/scene/gui/video_player.h +++ b/scene/gui/video_player.h @@ -29,15 +29,15 @@ #ifndef VIDEO_PLAYER_H #define VIDEO_PLAYER_H -#include "scene/resources/video_stream.h" #include "scene/gui/control.h" +#include "scene/resources/video_stream.h" #include "servers/audio/audio_rb_resampler.h" class VideoPlayer : public Control { - GDCLASS(VideoPlayer,Control); + GDCLASS(VideoPlayer, Control); -/* struct InternalStream : public AudioServer::AudioStream { + /* struct InternalStream : public AudioServer::AudioStream { VideoPlayer *player; virtual int get_channel_count() const; virtual void set_mix_rate(int p_rate); //notify the stream of the mix rate @@ -46,16 +46,15 @@ class VideoPlayer : public Control { }; */ -// InternalStream internal_stream; + // InternalStream internal_stream; Ref<VideoStreamPlayback> playback; Ref<VideoStream> stream; int sp_get_channel_count() const; void sp_set_mix_rate(int p_rate); //notify the stream of the mix rate - bool sp_mix(int32_t *p_buffer,int p_frames); + bool sp_mix(int32_t *p_buffer, int p_frames); void sp_update(); - RID stream_rid; Ref<ImageTexture> texture; @@ -70,24 +69,20 @@ class VideoPlayer : public Control { bool expand; bool loops; int buffering_ms; - int server_mix_rate; - int audio_track; - - static int _audio_mix_callback(void* p_udata,const int16_t *p_data,int p_frames); + int server_mix_rate; + int audio_track; + static int _audio_mix_callback(void *p_udata, const int16_t *p_data, int p_frames); protected: - static void _bind_methods(); void _notification(int p_notification); public: - Size2 get_minimum_size() const; void set_expand(bool p_expand); bool has_expand() const; - Ref<Texture> get_video_texture(); void set_stream(const Ref<VideoStream> &p_stream); |