diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-10-24 12:08:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-24 12:08:24 +0200 |
| commit | 0d9f87b37ead37b24640be4d661ebcb2cfc62045 (patch) | |
| tree | d5376e2dc15f5012f21ef5f2d93b72c8938712c1 /scene/gui/video_player.h | |
| parent | 3c033f84b1615830f0f52cf9e3e4c35e32ed7e30 (diff) | |
| parent | 61bda112bd28b970b069f70c8dbcefc11da9caed (diff) | |
Merge pull request #33023 from rxlecky/video-player-refactor
Refactor VideoPlayer and VideoStream
Diffstat (limited to 'scene/gui/video_player.h')
| -rw-r--r-- | scene/gui/video_player.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scene/gui/video_player.h b/scene/gui/video_player.h index 62fb7838b6..7d2821427e 100644 --- a/scene/gui/video_player.h +++ b/scene/gui/video_player.h @@ -55,7 +55,6 @@ class VideoPlayer : public Control { RID stream_rid; Ref<ImageTexture> texture; - Ref<Image> last_frame; AudioRBResampler resampler; Vector<AudioFrame> mix_buffer; @@ -75,19 +74,19 @@ class VideoPlayer : public Control { void _mix_audio(); static int _audio_mix_callback(void *p_udata, const float *p_data, int p_frames); - static void _mix_audios(void *self) { reinterpret_cast<VideoPlayer *>(self)->_mix_audio(); } + static void _mix_audios(void *p_self); protected: static void _bind_methods(); void _notification(int p_notification); - void _validate_property(PropertyInfo &property) const; + void _validate_property(PropertyInfo &p_property) const; public: Size2 get_minimum_size() const; void set_expand(bool p_expand); bool has_expand() const; - Ref<Texture> get_video_texture(); + Ref<Texture> get_video_texture() const; void set_stream(const Ref<VideoStream> &p_stream); Ref<VideoStream> get_stream() const; |