diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2015-12-28 01:18:37 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2015-12-28 01:18:37 +0100 |
| commit | 46eebac3ae299177063b2be69b4f3cd4552f083a (patch) | |
| tree | cccd866e0ad9766c5633581bf83aff7c915124ad /servers | |
| parent | 9fddc69769abf5df9472f283fab68967e7c8373b (diff) | |
Remove bogus argument in sample_get_description
Copy-paste mistake from the setter most likely.
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/audio/audio_server_sw.cpp | 2 | ||||
| -rw-r--r-- | servers/audio/audio_server_sw.h | 2 | ||||
| -rw-r--r-- | servers/audio_server.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/servers/audio/audio_server_sw.cpp b/servers/audio/audio_server_sw.cpp index 500886d73a..9d7cdc2420 100644 --- a/servers/audio/audio_server_sw.cpp +++ b/servers/audio/audio_server_sw.cpp @@ -360,7 +360,7 @@ void AudioServerSW::sample_set_description(RID p_sample, const String& p_descrip AUDIO_LOCK sample_manager->sample_set_description(p_sample,p_description); } -String AudioServerSW::sample_get_description(RID p_sample, const String& p_description) const { +String AudioServerSW::sample_get_description(RID p_sample) const { AUDIO_LOCK return sample_manager->sample_get_description(p_sample); diff --git a/servers/audio/audio_server_sw.h b/servers/audio/audio_server_sw.h index c566e129c1..75d635e243 100644 --- a/servers/audio/audio_server_sw.h +++ b/servers/audio/audio_server_sw.h @@ -118,7 +118,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; diff --git a/servers/audio_server.h b/servers/audio_server.h index cd3e920f31..6490a281d8 100644 --- a/servers/audio_server.h +++ b/servers/audio_server.h @@ -160,7 +160,7 @@ public: virtual RID sample_create(SampleFormat p_format, bool p_stereo, int p_length)=0; virtual void sample_set_description(RID p_sample, const String& p_description)=0; - virtual String sample_get_description(RID p_sample, const String& p_description) const=0; + virtual String sample_get_description(RID p_sample) const=0; virtual SampleFormat sample_get_format(RID p_sample) const=0; virtual bool sample_is_stereo(RID p_sample) const=0; |