godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove bogus argument in sample_get_description

Browse Source 
Copy-paste mistake from the setter most likely.
This commit is contained in:
Rémi Verschelde 2015-12-28 01:18:37 +01:00
parent 9fddc69769
commit 46eebac3ae
6 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/base/classes.xml
View File

@ -4104,8 +4104,6 @@
</return> </return>
<argument index="0" name="sample" type="RID"> <argument index="0" name="sample" type="RID">
</argument> </argument>
<argument index="1" name="arg1" type="String">
</argument>
<description> <description>
Return the description of an audio sample. Mainly used for organization. Return the description of an audio sample. Mainly used for organization.
</description> </description>

2
platform/javascript/audio_server_javascript.cpp
View File

@ -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(); return String();
} }

2
platform/javascript/audio_server_javascript.h
View File

@ -95,7 +95,7 @@ public:
virtual RID sample_create(SampleFormat p_format, bool p_stereo, int p_length); 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 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 SampleFormat sample_get_format(RID p_sample) const;
virtual bool sample_is_stereo(RID p_sample) const; virtual bool sample_is_stereo(RID p_sample) const;

2
servers/audio/audio_server_sw.cpp
View File

@ -360,7 +360,7 @@ void AudioServerSW::sample_set_description(RID p_sample, const String& p_descrip
AUDIO_LOCK AUDIO_LOCK
sample_manager->sample_set_description(p_sample,p_description); 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 AUDIO_LOCK
return sample_manager->sample_get_description(p_sample); return sample_manager->sample_get_description(p_sample);

2
servers/audio/audio_server_sw.h
View File

@ -118,7 +118,7 @@ public:
virtual RID sample_create(SampleFormat p_format, bool p_stereo, int p_length); 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 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 SampleFormat sample_get_format(RID p_sample) const;
virtual bool sample_is_stereo(RID p_sample) const; virtual bool sample_is_stereo(RID p_sample) const;

2
servers/audio_server.h
View File

@ -160,7 +160,7 @@ public:
virtual RID sample_create(SampleFormat p_format, bool p_stereo, int p_length)=0; 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 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 SampleFormat sample_get_format(RID p_sample) const=0;
virtual bool sample_is_stereo(RID p_sample) const=0; virtual bool sample_is_stereo(RID p_sample) const=0;