summaryrefslogtreecommitdiff
path: root/scene/resources
diff options
context:
space:
mode:
authorMatt Hughes <mhughes@laughlin.com>2017-09-14 15:45:02 -0500
committerHiroshi Ogawa <hi.ogawa.zz@gmail.com>2017-10-14 23:20:39 +0900
commit3edd3cd377511b4cef27478be24f7562273d69ce (patch)
tree204fcdded3bc7b46a6b559a5e5a44eba4244f25b /scene/resources
parente8f8359b2edd583480218b7348cdbe43e959a16e (diff)
Fix video playback
This adds support to - VideoPlayer - VideoStreamWebm - VideoStreamTheora
Diffstat (limited to 'scene/resources')
-rw-r--r--scene/resources/video_stream.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/resources/video_stream.h b/scene/resources/video_stream.h
index 0f07233185..0e430331d1 100644
--- a/scene/resources/video_stream.h
+++ b/scene/resources/video_stream.h
@@ -40,7 +40,7 @@ protected:
static void _bind_methods();
public:
- typedef int (*AudioMixCallback)(void *p_udata, const int16_t *p_data, int p_frames);
+ typedef int (*AudioMixCallback)(void *p_udata, const float *p_data, int p_frames);
virtual void stop() = 0;
virtual void play() = 0;
@@ -48,7 +48,7 @@ public:
virtual bool is_playing() const = 0;
virtual void set_paused(bool p_paused) = 0;
- virtual bool is_paused(bool p_paused) const = 0;
+ virtual bool is_paused() const = 0;
virtual void set_loop(bool p_enable) = 0;
virtual bool has_loop() const = 0;