diff options
| author | reduz <reduzio@gmail.com> | 2015-12-28 09:39:12 -0300 |
|---|---|---|
| committer | reduz <reduzio@gmail.com> | 2015-12-28 09:39:12 -0300 |
| commit | 5d47e42eb69fcc0d1f502f9b5e72e064cb22d34e (patch) | |
| tree | 68bdbda14e3a9c6ad23b96d0f5d8f2d49b4872a1 /platform | |
| parent | fcd4b1a421e9c3ed25201cfd428cfbe789b12204 (diff) | |
| parent | bfbde4dfd11be8728be4bb88d8bc109acb19ccfd (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/javascript/audio_server_javascript.cpp | 2 | ||||
| -rw-r--r-- | platform/javascript/audio_server_javascript.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/javascript/audio_server_javascript.cpp b/platform/javascript/audio_server_javascript.cpp index a2c6740eaf..fbd5d2e1c0 100644 --- a/platform/javascript/audio_server_javascript.cpp +++ b/platform/javascript/audio_server_javascript.cpp @@ -33,7 +33,7 @@ void AudioServerJavascript::sample_set_description(RID p_sample, const String& p } -String AudioServerJavascript::sample_get_description(RID p_sample, const String& p_description) const{ +String AudioServerJavascript::sample_get_description(RID p_sample) const{ return String(); } diff --git a/platform/javascript/audio_server_javascript.h b/platform/javascript/audio_server_javascript.h index 450237d324..1dc90c48ee 100644 --- a/platform/javascript/audio_server_javascript.h +++ b/platform/javascript/audio_server_javascript.h @@ -95,7 +95,7 @@ public: virtual RID sample_create(SampleFormat p_format, bool p_stereo, int p_length); virtual void sample_set_description(RID p_sample, const String& p_description); - virtual String sample_get_description(RID p_sample, const String& p_description) const; + virtual String sample_get_description(RID p_sample) const; virtual SampleFormat sample_get_format(RID p_sample) const; virtual bool sample_is_stereo(RID p_sample) const; |