godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-21 14:57:09 +00:00
Code Releases Wiki Activity

Bring that Whole New World to the Old Continent too

Browse Source 
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
2017-03-19 00:36:26 +01:00
parent 1d418afe86
commit f8db8a3faa
1308 changed files with 147754 additions and 174357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

196
scene/audio/stream_player.cpp
View File

@@ -32,34 +32,33 @@ int StreamPlayer::InternalStream::get_channel_count() const {
return player->sp_get_channel_count();
}
void StreamPlayer::InternalStream::set_mix_rate(int p_rate){
void StreamPlayer::InternalStream::set_mix_rate(int p_rate) {
return player->sp_set_mix_rate(p_rate);
}
bool StreamPlayer::InternalStream::mix(int32_t *p_buffer,int p_frames){
bool StreamPlayer::InternalStream::mix(int32_t *p_buffer, int p_frames) {
return player->sp_mix(p_buffer,p_frames);
return player->sp_mix(p_buffer, p_frames);
}
void StreamPlayer::InternalStream::update(){
void StreamPlayer::InternalStream::update() {
player->sp_update();
}
int StreamPlayer::sp_get_channel_count() const {
return playback->get_channels();
}
void StreamPlayer::sp_set_mix_rate(int p_rate){
void StreamPlayer::sp_set_mix_rate(int p_rate) {
server_mix_rate=p_rate;
server_mix_rate = p_rate;
}
bool StreamPlayer::sp_mix(int32_t *p_buffer,int p_frames) {
bool StreamPlayer::sp_mix(int32_t *p_buffer, int p_frames) {
if (resampler.is_ready() && !paused) {
return resampler.mix(p_buffer,p_frames);
return resampler.mix(p_buffer, p_frames);
}
return false;
@@ -74,9 +73,9 @@ void StreamPlayer::sp_update() {
//stream depleted data, but there's still audio in the ringbuffer
//check that all this audio has been flushed before stopping the stream
int to_mix = resampler.get_total() - resampler.get_todo();
if (to_mix==0) {
if (to_mix == 0) {
if (!stop_request) {
stop_request=true;
stop_request = true;
call_deferred("_do_stop");
}
return;
@@ -85,8 +84,8 @@ void StreamPlayer::sp_update() {
return;
}
int todo =resampler.get_todo();
int wrote = playback->mix(resampler.get_write_buffer(),todo);
int todo = resampler.get_todo();
int wrote = playback->mix(resampler.get_write_buffer(), todo);
resampler.write(wrote);
}
}
@@ -98,15 +97,15 @@ void StreamPlayer::_do_stop() {
void StreamPlayer::_notification(int p_what) {
switch(p_what) {
switch (p_what) {
case NOTIFICATION_ENTER_TREE: {
//set_idle_process(false); //don't annoy
if (stream.is_valid() && !get_tree()->is_editor_hint()) {
if (resume_pos>=0) {
if (resume_pos >= 0) {
play(resume_pos);
resume_pos=-1;
resume_pos = -1;
} else if (autoplay) {
play();
autoplay = false; //this line fix autoplay issues
@@ -117,27 +116,25 @@ void StreamPlayer::_notification(int p_what) {
case NOTIFICATION_EXIT_TREE: {
if (is_playing()) {
resume_pos=get_pos();
resume_pos = get_pos();
}
stop(); //wathever it may be doing, stop
} break;
}
}
void StreamPlayer::set_stream(const Ref<AudioStream> &p_stream) {
stop();
stream=p_stream;
stream = p_stream;
if (!stream.is_null()) {
playback=stream->instance_playback();
playback = stream->instance_playback();
playback->set_loop(loops);
playback->set_loop_restart_time(loop_point);
AudioServer::get_singleton()->lock();
resampler.setup(playback->get_channels(),playback->get_mix_rate(),server_mix_rate,buffering_ms,playback->get_minimum_buffer_size());
resampler.setup(playback->get_channels(), playback->get_mix_rate(), server_mix_rate, buffering_ms, playback->get_minimum_buffer_size());
AudioServer::get_singleton()->unlock();
} else {
AudioServer::get_singleton()->lock();
@@ -152,7 +149,6 @@ Ref<AudioStream> StreamPlayer::get_stream() const {
return stream;
}
void StreamPlayer::play(float p_from_offset) {
ERR_FAIL_COND(!is_inside_tree());
@@ -165,11 +161,10 @@ void StreamPlayer::play(float p_from_offset) {
playback->play(p_from_offset);
//feed the ringbuffer as long as no update callback is going on
sp_update();
AudioServer::get_singleton()->stream_set_active(stream_rid,true);
AudioServer::get_singleton()->stream_set_volume_scale(stream_rid,volume);
// if (stream->get_update_mode()!=AudioStream::UPDATE_NONE)
// set_idle_process(true);
AudioServer::get_singleton()->stream_set_active(stream_rid, true);
AudioServer::get_singleton()->stream_set_volume_scale(stream_rid, volume);
// if (stream->get_update_mode()!=AudioStream::UPDATE_NONE)
// set_idle_process(true);
}
void StreamPlayer::stop() {
@@ -180,11 +175,10 @@ void StreamPlayer::stop() {
return;
//_THREAD_SAFE_METHOD_
AudioServer::get_singleton()->stream_set_active(stream_rid,false);
stop_request=false;
AudioServer::get_singleton()->stream_set_active(stream_rid, false);
stop_request = false;
playback->stop();
resampler.flush();
//set_idle_process(false);
}
@@ -199,11 +193,10 @@ bool StreamPlayer::is_playing() const {
void StreamPlayer::set_loop(bool p_enable) {
loops=p_enable;
loops = p_enable;
if (playback.is_null())
return;
playback->set_loop(loops);
}
bool StreamPlayer::has_loop() const {
@@ -212,9 +205,9 @@ bool StreamPlayer::has_loop() const {
void StreamPlayer::set_volume(float p_vol) {
volume=p_vol;
volume = p_vol;
if (stream_rid.is_valid())
AudioServer::get_singleton()->stream_set_volume_scale(stream_rid,volume);
AudioServer::get_singleton()->stream_set_volume_scale(stream_rid, volume);
}
float StreamPlayer::get_volume() const {
@@ -224,7 +217,7 @@ float StreamPlayer::get_volume() const {
void StreamPlayer::set_loop_restart_time(float p_secs) {
loop_point=p_secs;
loop_point = p_secs;
if (playback.is_valid())
playback->set_loop_restart_time(p_secs);
}
@@ -234,10 +227,9 @@ float StreamPlayer::get_loop_restart_time() const {
return loop_point;
}
void StreamPlayer::set_volume_db(float p_db) {
if (p_db<-79)
if (p_db < -79)
set_volume(0);
else
set_volume(Math::db2linear(p_db));
@@ -245,35 +237,31 @@ void StreamPlayer::set_volume_db(float p_db) {
float StreamPlayer::get_volume_db() const {
if (volume==0)
if (volume == 0)
return -80;
else
return Math::linear2db(volume);
}
String StreamPlayer::get_stream_name() const {
String StreamPlayer::get_stream_name() const {
if (stream.is_null())
return "<No Stream>";
return stream->get_name();
}
int StreamPlayer::get_loop_count() const {
int StreamPlayer::get_loop_count() const {
if (playback.is_null())
return 0;
return playback->get_loop_count();
}
float StreamPlayer::get_pos() const {
float StreamPlayer::get_pos() const {
if (playback.is_null())
return 0;
return playback->get_pos();
}
float StreamPlayer::get_length() const {
@@ -289,12 +277,11 @@ void StreamPlayer::seek_pos(float p_time) {
//works better...
stop();
playback->play(p_time);
}
void StreamPlayer::set_autoplay(bool p_enable) {
autoplay=p_enable;
autoplay = p_enable;
}
bool StreamPlayer::has_autoplay() const {
@@ -304,7 +291,7 @@ bool StreamPlayer::has_autoplay() const {
void StreamPlayer::set_paused(bool p_paused) {
paused=p_paused;
paused = p_paused;
//if (stream.is_valid())
// stream->set_paused(p_paused);
}
@@ -316,109 +303,102 @@ bool StreamPlayer::is_paused() const {
void StreamPlayer::_set_play(bool p_play) {
_play=p_play;
_play = p_play;
if (is_inside_tree()) {
if(_play)
if (_play)
play();
else
stop();
}
}
bool StreamPlayer::_get_play() const{
bool StreamPlayer::_get_play() const {
return _play;
}
void StreamPlayer::set_buffering_msec(int p_msec) {
buffering_ms=p_msec;
buffering_ms = p_msec;
}
int StreamPlayer::get_buffering_msec() const{
int StreamPlayer::get_buffering_msec() const {
return buffering_ms;
}
void StreamPlayer::_bind_methods() {
ObjectTypeDB::bind_method(_MD("set_stream","stream:AudioStream"),&StreamPlayer::set_stream);
ObjectTypeDB::bind_method(_MD("get_stream:AudioStream"),&StreamPlayer::get_stream);
ObjectTypeDB::bind_method(_MD("set_stream", "stream:AudioStream"), &StreamPlayer::set_stream);
ObjectTypeDB::bind_method(_MD("get_stream:AudioStream"), &StreamPlayer::get_stream);
ObjectTypeDB::bind_method(_MD("play","offset"),&StreamPlayer::play,DEFVAL(0));
ObjectTypeDB::bind_method(_MD("stop"),&StreamPlayer::stop);
ObjectTypeDB::bind_method(_MD("play", "offset"), &StreamPlayer::play, DEFVAL(0));
ObjectTypeDB::bind_method(_MD("stop"), &StreamPlayer::stop);
ObjectTypeDB::bind_method(_MD("is_playing"),&StreamPlayer::is_playing);
ObjectTypeDB::bind_method(_MD("is_playing"), &StreamPlayer::is_playing);
ObjectTypeDB::bind_method(_MD("set_paused","paused"),&StreamPlayer::set_paused);
ObjectTypeDB::bind_method(_MD("is_paused"),&StreamPlayer::is_paused);
ObjectTypeDB::bind_method(_MD("set_paused", "paused"), &StreamPlayer::set_paused);
ObjectTypeDB::bind_method(_MD("is_paused"), &StreamPlayer::is_paused);
ObjectTypeDB::bind_method(_MD("set_loop","enabled"),&StreamPlayer::set_loop);
ObjectTypeDB::bind_method(_MD("has_loop"),&StreamPlayer::has_loop);
ObjectTypeDB::bind_method(_MD("set_loop", "enabled"), &StreamPlayer::set_loop);
ObjectTypeDB::bind_method(_MD("has_loop"), &StreamPlayer::has_loop);
ObjectTypeDB::bind_method(_MD("set_volume","volume"),&StreamPlayer::set_volume);
ObjectTypeDB::bind_method(_MD("get_volume"),&StreamPlayer::get_volume);
ObjectTypeDB::bind_method(_MD("set_volume", "volume"), &StreamPlayer::set_volume);
ObjectTypeDB::bind_method(_MD("get_volume"), &StreamPlayer::get_volume);
ObjectTypeDB::bind_method(_MD("set_volume_db","db"),&StreamPlayer::set_volume_db);
ObjectTypeDB::bind_method(_MD("get_volume_db"),&StreamPlayer::get_volume_db);
ObjectTypeDB::bind_method(_MD("set_volume_db", "db"), &StreamPlayer::set_volume_db);
ObjectTypeDB::bind_method(_MD("get_volume_db"), &StreamPlayer::get_volume_db);
ObjectTypeDB::bind_method(_MD("set_buffering_msec","msec"),&StreamPlayer::set_buffering_msec);
ObjectTypeDB::bind_method(_MD("get_buffering_msec"),&StreamPlayer::get_buffering_msec);
ObjectTypeDB::bind_method(_MD("set_buffering_msec", "msec"), &StreamPlayer::set_buffering_msec);
ObjectTypeDB::bind_method(_MD("get_buffering_msec"), &StreamPlayer::get_buffering_msec);
ObjectTypeDB::bind_method(_MD("set_loop_restart_time","secs"),&StreamPlayer::set_loop_restart_time);
ObjectTypeDB::bind_method(_MD("get_loop_restart_time"),&StreamPlayer::get_loop_restart_time);
ObjectTypeDB::bind_method(_MD("set_loop_restart_time", "secs"), &StreamPlayer::set_loop_restart_time);
ObjectTypeDB::bind_method(_MD("get_loop_restart_time"), &StreamPlayer::get_loop_restart_time);
ObjectTypeDB::bind_method(_MD("get_stream_name"),&StreamPlayer::get_stream_name);
ObjectTypeDB::bind_method(_MD("get_loop_count"),&StreamPlayer::get_loop_count);
ObjectTypeDB::bind_method(_MD("get_stream_name"), &StreamPlayer::get_stream_name);
ObjectTypeDB::bind_method(_MD("get_loop_count"), &StreamPlayer::get_loop_count);
ObjectTypeDB::bind_method(_MD("get_pos"),&StreamPlayer::get_pos);
ObjectTypeDB::bind_method(_MD("seek_pos","time"),&StreamPlayer::seek_pos);
ObjectTypeDB::bind_method(_MD("get_pos"), &StreamPlayer::get_pos);
ObjectTypeDB::bind_method(_MD("seek_pos", "time"), &StreamPlayer::seek_pos);
ObjectTypeDB::bind_method(_MD("set_autoplay","enabled"),&StreamPlayer::set_autoplay);
ObjectTypeDB::bind_method(_MD("has_autoplay"),&StreamPlayer::has_autoplay);
ObjectTypeDB::bind_method(_MD("set_autoplay", "enabled"), &StreamPlayer::set_autoplay);
ObjectTypeDB::bind_method(_MD("has_autoplay"), &StreamPlayer::has_autoplay);
ObjectTypeDB::bind_method(_MD("get_length"),&StreamPlayer::get_length);
ObjectTypeDB::bind_method(_MD("get_length"), &StreamPlayer::get_length);
ObjectTypeDB::bind_method(_MD("_set_play","play"),&StreamPlayer::_set_play);
ObjectTypeDB::bind_method(_MD("_get_play"),&StreamPlayer::_get_play);
ObjectTypeDB::bind_method(_MD("_do_stop"),&StreamPlayer::_do_stop);
ObjectTypeDB::bind_method(_MD("_set_play", "play"), &StreamPlayer::_set_play);
ObjectTypeDB::bind_method(_MD("_get_play"), &StreamPlayer::_get_play);
ObjectTypeDB::bind_method(_MD("_do_stop"), &StreamPlayer::_do_stop);
ADD_PROPERTY( PropertyInfo(Variant::OBJECT, "stream/stream", PROPERTY_HINT_RESOURCE_TYPE,"AudioStream"), _SCS("set_stream"), _SCS("get_stream") );
ADD_PROPERTY( PropertyInfo(Variant::BOOL, "stream/play"), _SCS("_set_play"), _SCS("_get_play") );
ADD_PROPERTY( PropertyInfo(Variant::BOOL, "stream/loop"), _SCS("set_loop"), _SCS("has_loop") );
ADD_PROPERTY( PropertyInfo(Variant::REAL, "stream/volume_db", PROPERTY_HINT_RANGE,"-80,24,0.01"), _SCS("set_volume_db"), _SCS("get_volume_db") );
ADD_PROPERTY( PropertyInfo(Variant::BOOL, "stream/autoplay"), _SCS("set_autoplay"), _SCS("has_autoplay") );
ADD_PROPERTY( PropertyInfo(Variant::BOOL, "stream/paused"), _SCS("set_paused"), _SCS("is_paused") );
ADD_PROPERTY( PropertyInfo(Variant::REAL, "stream/loop_restart_time"), _SCS("set_loop_restart_time"), _SCS("get_loop_restart_time") );
ADD_PROPERTY( PropertyInfo(Variant::INT, "stream/buffering_ms"), _SCS("set_buffering_msec"), _SCS("get_buffering_msec") );
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "stream/stream", PROPERTY_HINT_RESOURCE_TYPE, "AudioStream"), _SCS("set_stream"), _SCS("get_stream"));
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "stream/play"), _SCS("_set_play"), _SCS("_get_play"));
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "stream/loop"), _SCS("set_loop"), _SCS("has_loop"));
ADD_PROPERTY(PropertyInfo(Variant::REAL, "stream/volume_db", PROPERTY_HINT_RANGE, "-80,24,0.01"), _SCS("set_volume_db"), _SCS("get_volume_db"));
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "stream/autoplay"), _SCS("set_autoplay"), _SCS("has_autoplay"));
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "stream/paused"), _SCS("set_paused"), _SCS("is_paused"));
ADD_PROPERTY(PropertyInfo(Variant::REAL, "stream/loop_restart_time"), _SCS("set_loop_restart_time"), _SCS("get_loop_restart_time"));
ADD_PROPERTY(PropertyInfo(Variant::INT, "stream/buffering_ms"), _SCS("set_buffering_msec"), _SCS("get_buffering_msec"));
ADD_SIGNAL(MethodInfo("finished"));
}
StreamPlayer::StreamPlayer() {
volume=1;
loops=false;
paused=false;
autoplay=false;
_play=false;
server_mix_rate=1;
internal_stream.player=this;
stream_rid=AudioServer::get_singleton()->audio_stream_create(&internal_stream);
buffering_ms=500;
loop_point=0;
stop_request=false;
resume_pos=-1;
volume = 1;
loops = false;
paused = false;
autoplay = false;
_play = false;
server_mix_rate = 1;
internal_stream.player = this;
stream_rid = AudioServer::get_singleton()->audio_stream_create(&internal_stream);
buffering_ms = 500;
loop_point = 0;
stop_request = false;
resume_pos = -1;
}
StreamPlayer::~StreamPlayer() {
AudioServer::get_singleton()->free(stream_rid);
resampler.clear();
}