summaryrefslogtreecommitdiff
path: root/core/os
diff options
context:
space:
mode:
authorpunto- <ariel@godotengine.org>2016-02-19 02:32:41 -0300
committerpunto- <ariel@godotengine.org>2016-02-19 02:32:41 -0300
commit336f69b2144e978dcc98e2a0b4dd00022e46a43b (patch)
tree00f22a2608f7065dc4a0e338acbe4e21b17690cc /core/os
parent6a25a647b73e352f3c447cb97bdf01550be4a6cd (diff)
parent7b25641813b950e1e81a84e7b0392dcbddfb1011 (diff)
Merge pull request #3770 from kurikaesu/Native-Video-Player-enhancements
Reject any native video player calls on iOS that point to files withi…
Diffstat (limited to 'core/os')
-rw-r--r--core/os/os.cpp4
-rw-r--r--core/os/os.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/core/os/os.cpp b/core/os/os.cpp
index 0bc06c8375..1aee6d9aa2 100644
--- a/core/os/os.cpp
+++ b/core/os/os.cpp
@@ -478,6 +478,10 @@ void OS::native_video_pause() {
};
+void OS::native_video_unpause() {
+
+};
+
void OS::native_video_stop() {
};
diff --git a/core/os/os.h b/core/os/os.h
index 0d4edb035d..a80b81bfa2 100644
--- a/core/os/os.h
+++ b/core/os/os.h
@@ -376,6 +376,7 @@ public:
virtual Error native_video_play(String p_path, float p_volume, String p_audio_track, String p_subtitle_track);
virtual bool native_video_is_playing() const;
virtual void native_video_pause();
+ virtual void native_video_unpause();
virtual void native_video_stop();
virtual bool can_use_threads() const;