diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-10-03 15:34:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-03 15:34:29 +0200 |
| commit | 874e3b4a37f68d12341d172fe7c6076cce4de517 (patch) | |
| tree | 64c3778299810f2d601ba141628aae37a20b859b /platform/android/os_android.cpp | |
| parent | f8484bb77d6ddf1f5078d804a8abff3d106d6cab (diff) | |
| parent | d952126caf35fbc58db6976e6cc8be8baba95638 (diff) | |
Merge pull request #22676 from akien-mga/fix-warnings
Fix warnings in Android platform
Diffstat (limited to 'platform/android/os_android.cpp')
| -rw-r--r-- | platform/android/os_android.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp index 484ca4fff8..30bc413459 100644 --- a/platform/android/os_android.cpp +++ b/platform/android/os_android.cpp @@ -677,13 +677,14 @@ String OS_Android::get_unique_id() const { return OS::get_unique_id(); } -Error OS_Android::native_video_play(String p_path, float p_volume) { +Error OS_Android::native_video_play(String p_path, float p_volume, String p_audio_track, String p_subtitle_track) { + // FIXME: Add support for volume, audio and subtitle tracks if (video_play_func) video_play_func(p_path); return OK; } -bool OS_Android::native_video_is_playing() { +bool OS_Android::native_video_is_playing() const { if (video_is_playing_func) return video_is_playing_func(); return false; |