diff options
author | Kostadin Damyanov <maxmight@gmail.com> | 2016-01-15 22:43:54 +0200 |
---|---|---|
committer | Kostadin Damyanov <maxmight@gmail.com> | 2016-01-15 22:43:54 +0200 |
commit | 7998197ff17892a8127aa2fe53d13937763dee87 (patch) | |
tree | 53c97bf9907a3225776340273e773a4d904cbb73 /platform/javascript/audio_server_javascript.h | |
parent | 62574759ab16043b70f2da6e160072c353ba4148 (diff) | |
parent | 3c6dd5749d445f082fc925a34cc0a26f8d342304 (diff) | |
download | redot-engine-7998197ff17892a8127aa2fe53d13937763dee87.tar.gz |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'platform/javascript/audio_server_javascript.h')
-rw-r--r-- | platform/javascript/audio_server_javascript.h | 2 |
1 files changed, 1 insertions, 1 deletions
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; |