summaryrefslogtreecommitdiff
path: root/scene/resources
diff options
context:
space:
mode:
authorSeleckyErik <35656626+SeleckyErik@users.noreply.github.com>2019-10-24 01:35:47 +0100
committerSeleckyErik <35656626+SeleckyErik@users.noreply.github.com>2019-10-24 01:35:47 +0100
commit61bda112bd28b970b069f70c8dbcefc11da9caed (patch)
treea2ebd6d2bc6e3a0c3a828ac76311ad414d750cb2 /scene/resources
parent35944aebdeb4c3b5869aaeedaaded02397b7ce92 (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 'scene/resources')
-rw-r--r--scene/resources/video_stream.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/resources/video_stream.h b/scene/resources/video_stream.h
index eb3bf6770f..81c7b062cc 100644
--- a/scene/resources/video_stream.h
+++ b/scene/resources/video_stream.h
@@ -63,7 +63,7 @@ public:
//virtual int mix(int16_t* p_buffer,int p_frames)=0;
- virtual Ref<Texture> get_texture() = 0;
+ virtual Ref<Texture> get_texture() const = 0;
virtual void update(float p_delta) = 0;
virtual void set_mix_callback(AudioMixCallback p_callback, void *p_userdata) = 0;