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 /modules/gdnative | |
| parent | 3c033f84b1615830f0f52cf9e3e4c35e32ed7e30 (diff) | |
| parent | 61bda112bd28b970b069f70c8dbcefc11da9caed (diff) | |
| download | redot-engine-0d9f87b37ead37b24640be4d661ebcb2cfc62045.tar.gz | |
Merge pull request #33023 from rxlecky/video-player-refactor
Refactor VideoPlayer and VideoStream
Diffstat (limited to 'modules/gdnative')
| -rw-r--r-- | modules/gdnative/videodecoder/video_stream_gdnative.cpp | 2 | ||||
| -rw-r--r-- | modules/gdnative/videodecoder/video_stream_gdnative.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/gdnative/videodecoder/video_stream_gdnative.cpp b/modules/gdnative/videodecoder/video_stream_gdnative.cpp index f3c34fd5e0..14b7f9a2ef 100644 --- a/modules/gdnative/videodecoder/video_stream_gdnative.cpp +++ b/modules/gdnative/videodecoder/video_stream_gdnative.cpp @@ -279,7 +279,7 @@ void VideoStreamPlaybackGDNative::set_paused(bool p_paused) { paused = p_paused; } -Ref<Texture> VideoStreamPlaybackGDNative::get_texture() { +Ref<Texture> VideoStreamPlaybackGDNative::get_texture() const { return texture; } diff --git a/modules/gdnative/videodecoder/video_stream_gdnative.h b/modules/gdnative/videodecoder/video_stream_gdnative.h index 9aed1fd2a0..5ff7acb616 100644 --- a/modules/gdnative/videodecoder/video_stream_gdnative.h +++ b/modules/gdnative/videodecoder/video_stream_gdnative.h @@ -168,7 +168,7 @@ public: //virtual int mix(int16_t* p_buffer,int p_frames)=0; - virtual Ref<Texture> get_texture(); + virtual Ref<Texture> get_texture() const; virtual void update(float p_delta); virtual void set_mix_callback(AudioMixCallback p_callback, void *p_userdata); |
