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

162
scene/audio/event_player.cpp
View File

@@ -28,10 +28,9 @@
/*************************************************************************/
#include "event_player.h"
void EventPlayer::_notification(int p_what) {
switch(p_what) {
switch (p_what) {
case NOTIFICATION_ENTER_TREE: {
@@ -46,14 +45,12 @@ void EventPlayer::_notification(int p_what) {
}
}
void EventPlayer::set_stream(const Ref<EventStream> &p_stream) {
stop();
stream=p_stream;
stream = p_stream;
if (stream.is_valid())
playback=stream->instance_playback();
playback = stream->instance_playback();
else
playback.unref();
@@ -62,11 +59,9 @@ void EventPlayer::set_stream(const Ref<EventStream> &p_stream) {
playback->set_loop(loops);
playback->set_paused(paused);
playback->set_volume(volume);
for(int i=0;i<(MIN(MAX_CHANNELS,stream->get_channel_count()));i++)
playback->set_channel_volume(i,channel_volume[i]);
for (int i = 0; i < (MIN(MAX_CHANNELS, stream->get_channel_count())); i++)
playback->set_channel_volume(i, channel_volume[i]);
}
}
Ref<EventStream> EventPlayer::get_stream() const {
@@ -74,7 +69,6 @@ Ref<EventStream> EventPlayer::get_stream() const {
return stream;
}
void EventPlayer::play() {
ERR_FAIL_COND(!is_inside_tree());
@@ -90,7 +84,6 @@ void EventPlayer::play() {
AudioServer::get_singleton()->lock();
playback->play();
AudioServer::get_singleton()->unlock();
}
void EventPlayer::stop() {
@@ -115,11 +108,10 @@ bool EventPlayer::is_playing() const {
void EventPlayer::set_loop(bool p_enable) {
loops=p_enable;
loops = p_enable;
if (playback.is_null())
return;
playback->set_loop(loops);
}
bool EventPlayer::has_loop() const {
@@ -128,7 +120,7 @@ bool EventPlayer::has_loop() const {
void EventPlayer::set_volume(float p_volume) {
volume=p_volume;
volume = p_volume;
if (playback.is_valid())
playback->set_volume(volume);
}
@@ -138,10 +130,9 @@ float EventPlayer::get_volume() const {
return volume;
}
void EventPlayer::set_volume_db(float p_db) {
if (p_db<-79)
if (p_db < -79)
set_volume(0);
else
set_volume(Math::db2linear(p_db));
@@ -149,7 +140,7 @@ void EventPlayer::set_volume_db(float p_db) {
float EventPlayer::get_volume_db() const {
if (volume==0)
if (volume == 0)
return -80;
else
return Math::linear2db(volume);
@@ -157,7 +148,7 @@ float EventPlayer::get_volume_db() const {
void EventPlayer::set_pitch_scale(float p_pitch_scale) {
pitch_scale=p_pitch_scale;
pitch_scale = p_pitch_scale;
if (playback.is_valid())
playback->set_pitch_scale(pitch_scale);
}
@@ -169,7 +160,7 @@ float EventPlayer::get_pitch_scale() const {
void EventPlayer::set_tempo_scale(float p_tempo_scale) {
tempo_scale=p_tempo_scale;
tempo_scale = p_tempo_scale;
if (playback.is_valid())
playback->set_tempo_scale(tempo_scale);
}
@@ -179,29 +170,25 @@ float EventPlayer::get_tempo_scale() const {
return tempo_scale;
}
String EventPlayer::get_stream_name() const {
String EventPlayer::get_stream_name() const {
if (stream.is_null())
return "<No Stream>";
return stream->get_name();
}
int EventPlayer::get_loop_count() const {
int EventPlayer::get_loop_count() const {
if (playback.is_null())
return 0;
return playback->get_loop_count();
}
float EventPlayer::get_pos() const {
float EventPlayer::get_pos() const {
if (playback.is_null())
return 0;
return playback->get_pos();
}
float EventPlayer::get_length() const {
@@ -215,12 +202,11 @@ void EventPlayer::seek_pos(float p_time) {
if (playback.is_null())
return;
return playback->seek_pos(p_time);
}
void EventPlayer::set_autoplay(bool p_enable) {
autoplay=p_enable;
autoplay = p_enable;
}
bool EventPlayer::has_autoplay() const {
@@ -230,7 +216,7 @@ bool EventPlayer::has_autoplay() const {
void EventPlayer::set_paused(bool p_paused) {
paused=p_paused;
paused = p_paused;
if (playback.is_valid())
playback->set_paused(p_paused);
}
@@ -242,34 +228,32 @@ bool EventPlayer::is_paused() const {
void EventPlayer::_set_play(bool p_play) {
_play=p_play;
_play = p_play;
if (is_inside_tree()) {
if(_play)
if (_play)
play();
else
stop();
}
}
bool EventPlayer::_get_play() const{
bool EventPlayer::_get_play() const {
return _play;
}
void EventPlayer::set_channel_volume(int p_channel,float p_volume) {
void EventPlayer::set_channel_volume(int p_channel, float p_volume) {
ERR_FAIL_INDEX(p_channel,MAX_CHANNELS);
channel_volume[p_channel]=p_volume;
ERR_FAIL_INDEX(p_channel, MAX_CHANNELS);
channel_volume[p_channel] = p_volume;
if (playback.is_valid())
playback->set_channel_volume(p_channel,p_volume);
playback->set_channel_volume(p_channel, p_volume);
}
float EventPlayer::get_channel_volume(int p_channel) const{
float EventPlayer::get_channel_volume(int p_channel) const {
ERR_FAIL_INDEX_V(p_channel,MAX_CHANNELS,0);
ERR_FAIL_INDEX_V(p_channel, MAX_CHANNELS, 0);
return channel_volume[p_channel];
}
float EventPlayer::get_channel_last_note_time(int p_channel) const {
@@ -282,76 +266,72 @@ float EventPlayer::get_channel_last_note_time(int p_channel) const {
void EventPlayer::_bind_methods() {
ObjectTypeDB::bind_method(_MD("set_stream","stream:EventStream"),&EventPlayer::set_stream);
ObjectTypeDB::bind_method(_MD("get_stream:EventStream"),&EventPlayer::get_stream);
ObjectTypeDB::bind_method(_MD("set_stream", "stream:EventStream"), &EventPlayer::set_stream);
ObjectTypeDB::bind_method(_MD("get_stream:EventStream"), &EventPlayer::get_stream);
ObjectTypeDB::bind_method(_MD("play"),&EventPlayer::play);
ObjectTypeDB::bind_method(_MD("stop"),&EventPlayer::stop);
ObjectTypeDB::bind_method(_MD("play"), &EventPlayer::play);
ObjectTypeDB::bind_method(_MD("stop"), &EventPlayer::stop);
ObjectTypeDB::bind_method(_MD("is_playing"),&EventPlayer::is_playing);
ObjectTypeDB::bind_method(_MD("is_playing"), &EventPlayer::is_playing);
ObjectTypeDB::bind_method(_MD("set_paused","paused"),&EventPlayer::set_paused);
ObjectTypeDB::bind_method(_MD("is_paused"),&EventPlayer::is_paused);
ObjectTypeDB::bind_method(_MD("set_paused", "paused"), &EventPlayer::set_paused);
ObjectTypeDB::bind_method(_MD("is_paused"), &EventPlayer::is_paused);
ObjectTypeDB::bind_method(_MD("set_loop","enabled"),&EventPlayer::set_loop);
ObjectTypeDB::bind_method(_MD("has_loop"),&EventPlayer::has_loop);
ObjectTypeDB::bind_method(_MD("set_loop", "enabled"), &EventPlayer::set_loop);
ObjectTypeDB::bind_method(_MD("has_loop"), &EventPlayer::has_loop);
ObjectTypeDB::bind_method(_MD("set_volume","volume"),&EventPlayer::set_volume);
ObjectTypeDB::bind_method(_MD("get_volume"),&EventPlayer::get_volume);
ObjectTypeDB::bind_method(_MD("set_volume", "volume"), &EventPlayer::set_volume);
ObjectTypeDB::bind_method(_MD("get_volume"), &EventPlayer::get_volume);
ObjectTypeDB::bind_method(_MD("set_pitch_scale","pitch_scale"),&EventPlayer::set_pitch_scale);
ObjectTypeDB::bind_method(_MD("get_pitch_scale"),&EventPlayer::get_pitch_scale);
ObjectTypeDB::bind_method(_MD("set_pitch_scale", "pitch_scale"), &EventPlayer::set_pitch_scale);
ObjectTypeDB::bind_method(_MD("get_pitch_scale"), &EventPlayer::get_pitch_scale);
ObjectTypeDB::bind_method(_MD("set_tempo_scale","tempo_scale"),&EventPlayer::set_tempo_scale);
ObjectTypeDB::bind_method(_MD("get_tempo_scale"),&EventPlayer::get_tempo_scale);
ObjectTypeDB::bind_method(_MD("set_tempo_scale", "tempo_scale"), &EventPlayer::set_tempo_scale);
ObjectTypeDB::bind_method(_MD("get_tempo_scale"), &EventPlayer::get_tempo_scale);
ObjectTypeDB::bind_method(_MD("set_volume_db","db"),&EventPlayer::set_volume_db);
ObjectTypeDB::bind_method(_MD("get_volume_db"),&EventPlayer::get_volume_db);
ObjectTypeDB::bind_method(_MD("set_volume_db", "db"), &EventPlayer::set_volume_db);
ObjectTypeDB::bind_method(_MD("get_volume_db"), &EventPlayer::get_volume_db);
ObjectTypeDB::bind_method(_MD("get_stream_name"),&EventPlayer::get_stream_name);
ObjectTypeDB::bind_method(_MD("get_loop_count"),&EventPlayer::get_loop_count);
ObjectTypeDB::bind_method(_MD("get_stream_name"), &EventPlayer::get_stream_name);
ObjectTypeDB::bind_method(_MD("get_loop_count"), &EventPlayer::get_loop_count);
ObjectTypeDB::bind_method(_MD("get_pos"),&EventPlayer::get_pos);
ObjectTypeDB::bind_method(_MD("seek_pos","time"),&EventPlayer::seek_pos);
ObjectTypeDB::bind_method(_MD("get_pos"), &EventPlayer::get_pos);
ObjectTypeDB::bind_method(_MD("seek_pos", "time"), &EventPlayer::seek_pos);
ObjectTypeDB::bind_method(_MD("get_length"),&EventPlayer::get_length);
ObjectTypeDB::bind_method(_MD("get_length"), &EventPlayer::get_length);
ObjectTypeDB::bind_method(_MD("set_autoplay","enabled"),&EventPlayer::set_autoplay);
ObjectTypeDB::bind_method(_MD("has_autoplay"),&EventPlayer::has_autoplay);
ObjectTypeDB::bind_method(_MD("set_autoplay", "enabled"), &EventPlayer::set_autoplay);
ObjectTypeDB::bind_method(_MD("has_autoplay"), &EventPlayer::has_autoplay);
ObjectTypeDB::bind_method(_MD("set_channel_volume","channel","channel_volume"),&EventPlayer::set_channel_volume);
ObjectTypeDB::bind_method(_MD("get_channel_volume","channel"),&EventPlayer::get_channel_volume);
ObjectTypeDB::bind_method(_MD("get_channel_last_note_time","channel"),&EventPlayer::get_channel_last_note_time);
ObjectTypeDB::bind_method(_MD("set_channel_volume", "channel", "channel_volume"), &EventPlayer::set_channel_volume);
ObjectTypeDB::bind_method(_MD("get_channel_volume", "channel"), &EventPlayer::get_channel_volume);
ObjectTypeDB::bind_method(_MD("get_channel_last_note_time", "channel"), &EventPlayer::get_channel_last_note_time);
ObjectTypeDB::bind_method(_MD("_set_play","play"),&EventPlayer::_set_play);
ObjectTypeDB::bind_method(_MD("_get_play"),&EventPlayer::_get_play);
ObjectTypeDB::bind_method(_MD("_set_play", "play"), &EventPlayer::_set_play);
ObjectTypeDB::bind_method(_MD("_get_play"), &EventPlayer::_get_play);
ADD_PROPERTY( PropertyInfo(Variant::OBJECT, "stream/stream", PROPERTY_HINT_RESOURCE_TYPE,"EventStream"), _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::REAL, "stream/pitch_scale", PROPERTY_HINT_RANGE,"0.001,16,0.001"), _SCS("set_pitch_scale"), _SCS("get_pitch_scale") );
ADD_PROPERTY( PropertyInfo(Variant::REAL, "stream/tempo_scale", PROPERTY_HINT_RANGE,"0.001,16,0.001"), _SCS("set_tempo_scale"), _SCS("get_tempo_scale") );
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::OBJECT, "stream/stream", PROPERTY_HINT_RESOURCE_TYPE, "EventStream"), _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::REAL, "stream/pitch_scale", PROPERTY_HINT_RANGE, "0.001,16,0.001"), _SCS("set_pitch_scale"), _SCS("get_pitch_scale"));
ADD_PROPERTY(PropertyInfo(Variant::REAL, "stream/tempo_scale", PROPERTY_HINT_RANGE, "0.001,16,0.001"), _SCS("set_tempo_scale"), _SCS("get_tempo_scale"));
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"));
}
EventPlayer::EventPlayer() {
volume=1;
loops=false;
paused=false;
autoplay=false;
_play=false;
pitch_scale=1.0;
tempo_scale=1.0;
for(int i=0;i<MAX_CHANNELS;i++)
channel_volume[i]=1.0;
volume = 1;
loops = false;
paused = false;
autoplay = false;
_play = false;
pitch_scale = 1.0;
tempo_scale = 1.0;
for (int i = 0; i < MAX_CHANNELS; i++)
channel_volume[i] = 1.0;
}
EventPlayer::~EventPlayer() {
}