summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2015-09-26 23:45:17 +0200
committerRémi Verschelde <rverschelde@gmail.com>2015-09-26 23:58:11 +0200
commit2caf1548a5e95cd6506c4a3574597b9229414368 (patch)
tree6f60420eb04164d1cf1b61da6b64c8f95f80398e
parent9e54b5c62b177ced1643f22f13a480ed7646d27e (diff)
Fix return type of get_reverb_room
-rw-r--r--scene/audio/sample_player.cpp6
-rw-r--r--scene/audio/sample_player.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/scene/audio/sample_player.cpp b/scene/audio/sample_player.cpp
index 4e2c3f5dfd..7c0a926324 100644
--- a/scene/audio/sample_player.cpp
+++ b/scene/audio/sample_player.cpp
@@ -460,9 +460,9 @@ float SamplePlayer::get_chorus(VoiceID p_voice) const {
return v.chorus_send;
}
-float SamplePlayer::get_reverb_room(VoiceID p_voice) const {
+SamplePlayer::ReverbRoomType SamplePlayer::get_reverb_room(VoiceID p_voice) const {
- _GET_VOICE_V(0);
+ _GET_VOICE_V(REVERB_SMALL);
return v.reverb_room;
}
@@ -591,7 +591,7 @@ float SamplePlayer::get_default_chorus() const {
return _default.chorus_send;
}
-float SamplePlayer::get_default_reverb_room() const {
+SamplePlayer::ReverbRoomType SamplePlayer::get_default_reverb_room() const {
return _default.reverb_room;
}
diff --git a/scene/audio/sample_player.h b/scene/audio/sample_player.h
index 4637313dd2..75a01aff86 100644
--- a/scene/audio/sample_player.h
+++ b/scene/audio/sample_player.h
@@ -161,7 +161,7 @@ public:
float get_filter_resonance(VoiceID p_voice) const;
float get_filter_gain(VoiceID p_voice) const;
float get_chorus(VoiceID p_voice) const;
- float get_reverb_room(VoiceID p_voice) const;
+ ReverbRoomType get_reverb_room(VoiceID p_voice) const;
float get_reverb(VoiceID p_voice) const;
@@ -185,7 +185,7 @@ public:
float get_default_filter_resonance() const;
float get_default_filter_gain() const;
float get_default_chorus() const;
- float get_default_reverb_room() const;
+ ReverbRoomType get_default_reverb_room() const;
float get_default_reverb() const;
SamplePlayer();