diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-13 19:57:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-13 19:57:18 +0100 |
| commit | 03a080547dacdec0d8c181df700ef8dd1c092913 (patch) | |
| tree | 8d7c100e1e12f9dbc3f106e817f758c9dbb40b3c /scene/resources | |
| parent | 4c000a05f6275ae7b539927d4a2608cb54e34308 (diff) | |
| parent | 3edd3cd377511b4cef27478be24f7562273d69ce (diff) | |
Merge pull request #12014 from hi-ogawa/fix-video-playback
Fix video playback
Diffstat (limited to 'scene/resources')
| -rw-r--r-- | scene/resources/video_stream.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/resources/video_stream.h b/scene/resources/video_stream.h index 3f79858056..fbe52909e7 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; |