diff options
author | SeleckyErik <35656626+SeleckyErik@users.noreply.github.com> | 2019-10-24 01:35:47 +0100 |
---|---|---|
committer | SeleckyErik <35656626+SeleckyErik@users.noreply.github.com> | 2019-10-24 01:35:47 +0100 |
commit | 61bda112bd28b970b069f70c8dbcefc11da9caed (patch) | |
tree | a2ebd6d2bc6e3a0c3a828ac76311ad414d750cb2 /modules/webm | |
parent | 35944aebdeb4c3b5869aaeedaaded02397b7ce92 (diff) |
Refactor VideoPlayer and VideoStream
VideoStream:
- Fix const correctenss
VideoPlayer:
- Remove unused member variable last_frame
- Move _mix_audios function definition to source file
- Fix function parameter naming to match p_ convention
- Fix const correctness
- Add null checking
Diffstat (limited to 'modules/webm')
-rw-r--r-- | modules/webm/video_stream_webm.cpp | 2 | ||||
-rw-r--r-- | modules/webm/video_stream_webm.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/webm/video_stream_webm.cpp b/modules/webm/video_stream_webm.cpp index fa3602ad27..4ce0db3746 100644 --- a/modules/webm/video_stream_webm.cpp +++ b/modules/webm/video_stream_webm.cpp @@ -230,7 +230,7 @@ void VideoStreamPlaybackWebm::set_audio_track(int p_idx) { audio_track = p_idx; } -Ref<Texture> VideoStreamPlaybackWebm::get_texture() { +Ref<Texture> VideoStreamPlaybackWebm::get_texture() const { return texture; } diff --git a/modules/webm/video_stream_webm.h b/modules/webm/video_stream_webm.h index ddcbb1eb08..4f79d46cce 100644 --- a/modules/webm/video_stream_webm.h +++ b/modules/webm/video_stream_webm.h @@ -90,7 +90,7 @@ public: virtual void set_audio_track(int p_idx); - 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); |