|
@@ -94,7 +94,6 @@ void AudioStreamPlayer::_mix_internal(bool p_fadeout) {
|
|
//set volume for next mix
|
|
//set volume for next mix
|
|
mix_volume_db = target_volume;
|
|
mix_volume_db = target_volume;
|
|
|
|
|
|
- time_mixed += double(buffer_size) / AudioServer::get_singleton()->get_mix_rate();
|
|
|
|
_mix_to_bus(buffer,buffer_size);
|
|
_mix_to_bus(buffer,buffer_size);
|
|
|
|
|
|
}
|
|
}
|
|
@@ -130,9 +129,8 @@ void AudioStreamPlayer::_mix_audio() {
|
|
|
|
|
|
//fade out to avoid pops
|
|
//fade out to avoid pops
|
|
_mix_internal(true);
|
|
_mix_internal(true);
|
|
- } else {
|
|
|
|
- time_mixed=0;
|
|
|
|
}
|
|
}
|
|
|
|
+
|
|
stream_playback->start(setseek);
|
|
stream_playback->start(setseek);
|
|
setseek = -1.0; //reset seek
|
|
setseek = -1.0; //reset seek
|
|
mix_volume_db = volume_db; //reset ramp
|
|
mix_volume_db = volume_db; //reset ramp
|
|
@@ -293,10 +291,6 @@ float AudioStreamPlayer::get_playback_position() {
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
-float AudioStreamPlayer::get_mix_time() const {
|
|
|
|
- return time_mixed;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
void AudioStreamPlayer::set_bus(const StringName &p_bus) {
|
|
void AudioStreamPlayer::set_bus(const StringName &p_bus) {
|
|
|
|
|
|
//if audio is active, must lock this
|
|
//if audio is active, must lock this
|
|
@@ -400,7 +394,6 @@ void AudioStreamPlayer::_bind_methods() {
|
|
|
|
|
|
ClassDB::bind_method(D_METHOD("is_playing"), &AudioStreamPlayer::is_playing);
|
|
ClassDB::bind_method(D_METHOD("is_playing"), &AudioStreamPlayer::is_playing);
|
|
ClassDB::bind_method(D_METHOD("get_playback_position"), &AudioStreamPlayer::get_playback_position);
|
|
ClassDB::bind_method(D_METHOD("get_playback_position"), &AudioStreamPlayer::get_playback_position);
|
|
- ClassDB::bind_method(D_METHOD("get_mix_time"), &AudioStreamPlayer::get_mix_time);
|
|
|
|
|
|
|
|
ClassDB::bind_method(D_METHOD("set_bus", "bus"), &AudioStreamPlayer::set_bus);
|
|
ClassDB::bind_method(D_METHOD("set_bus", "bus"), &AudioStreamPlayer::set_bus);
|
|
ClassDB::bind_method(D_METHOD("get_bus"), &AudioStreamPlayer::get_bus);
|
|
ClassDB::bind_method(D_METHOD("get_bus"), &AudioStreamPlayer::get_bus);
|
|
@@ -451,7 +444,6 @@ AudioStreamPlayer::AudioStreamPlayer() {
|
|
fadeout_buffer.resize(512);
|
|
fadeout_buffer.resize(512);
|
|
setstop=false;
|
|
setstop=false;
|
|
use_fadeout=false;
|
|
use_fadeout=false;
|
|
- time_mixed = 0;
|
|
|
|
|
|
|
|
AudioServer::get_singleton()->connect("bus_layout_changed", this, "_bus_layout_changed");
|
|
AudioServer::get_singleton()->connect("bus_layout_changed", this, "_bus_layout_changed");
|
|
}
|
|
}
|