Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages 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

51
drivers/pulseaudio/audio_driver_pulseaudio.cpp
View file

@ -43,7 +43,7 @@ Error AudioDriverPulseAudio::init() {
samples_in = NULL;
samples_out = NULL;
mix_rate = GLOBAL_DEF("audio/mix_rate",44100);
mix_rate = GLOBAL_DEF("audio/mix_rate", 44100);
output_format = OUTPUT_STEREO;
channels = 2;
@ -64,23 +64,21 @@ Error AudioDriverPulseAudio::init() {
attr.minreq = (uint32_t)-1;
int error_code;
pulse = pa_simple_new( NULL, // default server
"Godot", // application name
PA_STREAM_PLAYBACK,
NULL, // default device
"Sound", // stream description
&spec,
NULL, // use default channel map
&attr, // use buffering attributes from above
&error_code
);
pulse = pa_simple_new(NULL, // default server
"Godot", // application name
PA_STREAM_PLAYBACK,
NULL, // default device
"Sound", // stream description
&spec,
NULL, // use default channel map
&attr, // use buffering attributes from above
&error_code);
if (pulse == NULL) {
fprintf(stderr, "PulseAudio ERR: %s\n", pa_strerror(error_code));\
fprintf(stderr, "PulseAudio ERR: %s\n", pa_strerror(error_code));
ERR_FAIL_COND_V(pulse == NULL, ERR_CANT_OPEN);
}
samples_in = memnew_arr(int32_t, buffer_size * channels);
samples_out = memnew_arr(int16_t, buffer_size * channels);
@ -92,22 +90,22 @@ Error AudioDriverPulseAudio::init() {
float AudioDriverPulseAudio::get_latency() {
if (latency==0) { //only do this once since it's approximate anyway
if (latency == 0) { //only do this once since it's approximate anyway
int error_code;
pa_usec_t palat = pa_simple_get_latency( pulse,&error_code);
latency=double(palat)/1000000.0;
pa_usec_t palat = pa_simple_get_latency(pulse, &error_code);
latency = double(palat) / 1000000.0;
}
return latency;
}
void AudioDriverPulseAudio::thread_func(void* p_udata) {
void AudioDriverPulseAudio::thread_func(void *p_udata) {
AudioDriverPulseAudio* ad = (AudioDriverPulseAudio*)p_udata;
AudioDriverPulseAudio *ad = (AudioDriverPulseAudio *)p_udata;
while (!ad->exit_thread) {
if (!ad->active) {
for (unsigned int i=0; i < ad->buffer_size * ad->channels; i++) {
for (unsigned int i = 0; i < ad->buffer_size * ad->channels; i++) {
ad->samples_out[i] = 0;
}
@ -118,12 +116,12 @@ void AudioDriverPulseAudio::thread_func(void* p_udata) {
ad->unlock();
for (unsigned int i=0; i < ad->buffer_size * ad->channels;i ++) {
for (unsigned int i = 0; i < ad->buffer_size * ad->channels; i++) {
ad->samples_out[i] = ad->samples_in[i] >> 16;
}
}
}
// pa_simple_write always consumes the entire buffer
// pa_simple_write always consumes the entire buffer
int error_code;
int byte_size = ad->buffer_size * sizeof(int16_t) * ad->channels;
@ -134,7 +132,7 @@ void AudioDriverPulseAudio::thread_func(void* p_udata) {
ad->exit_thread = true;
break;
}
}
}
ad->thread_exited = true;
}
@ -176,8 +174,8 @@ void AudioDriverPulseAudio::finish() {
exit_thread = true;
Thread::wait_to_finish(thread);
if (pulse)
pa_simple_free(pulse);
if (pulse)
pa_simple_free(pulse);
if (samples_in) {
memdelete_arr(samples_in);
@ -198,11 +196,10 @@ AudioDriverPulseAudio::AudioDriverPulseAudio() {
mutex = NULL;
thread = NULL;
pulse = NULL;
latency=0;
latency = 0;
}
AudioDriverPulseAudio::~AudioDriverPulseAudio() {
}
#endif

26
drivers/pulseaudio/audio_driver_pulseaudio.h
View file

@ -30,27 +30,27 @@
#ifdef PULSEAUDIO_ENABLED
#include "core/os/thread.h"
#include "core/os/mutex.h"
#include "core/os/thread.h"
#include <pulse/simple.h>
class AudioDriverPulseAudio : public AudioDriverSW {
Thread* thread;
Mutex* mutex;
Thread *thread;
Mutex *mutex;
pa_simple* pulse;
pa_simple *pulse;
int32_t* samples_in;
int16_t* samples_out;
int32_t *samples_in;
int16_t *samples_out;
static void thread_func(void* p_udata);
static void thread_func(void *p_udata);
unsigned int mix_rate;
OutputFormat output_format;
unsigned int buffer_size;
unsigned int buffer_size;
int channels;
bool active;
@ -61,9 +61,8 @@ class AudioDriverPulseAudio : public AudioDriverSW {
float latency;
public:
const char* get_name() const {
return "PulseAudio";
const char *get_name() const {
return "PulseAudio";
};
virtual Error init();
@ -76,9 +75,8 @@ public:
virtual float get_latency();
AudioDriverPulseAudio();
~AudioDriverPulseAudio();
AudioDriverPulseAudio();
~AudioDriverPulseAudio();
};
#endif