A Whole New World (clang-format edition)
I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
This commit is contained in:
Rémi Verschelde
parent
45438e9918
commit
5dbf1809c6
1318 changed files with 140051 additions and 166004 deletions
|
|
@ -28,60 +28,57 @@
|
|||
/*************************************************************************/
|
||||
#include "audio_stream_ogg_vorbis.h"
|
||||
|
||||
|
||||
|
||||
size_t AudioStreamPlaybackOGGVorbis::_ov_read_func(void *p_dst,size_t p_data, size_t p_count, void *_f) {
|
||||
size_t AudioStreamPlaybackOGGVorbis::_ov_read_func(void *p_dst, size_t p_data, size_t p_count, void *_f) {
|
||||
|
||||
//printf("read to %p, %i bytes, %i nmemb, %p\n",p_dst,p_data,p_count,_f);
|
||||
FileAccess *fa=(FileAccess*)_f;
|
||||
size_t read_total = p_data*p_count;
|
||||
FileAccess *fa = (FileAccess *)_f;
|
||||
size_t read_total = p_data * p_count;
|
||||
|
||||
if (fa->eof_reached())
|
||||
return 0;
|
||||
|
||||
uint8_t *dst=(uint8_t*)p_dst;
|
||||
uint8_t *dst = (uint8_t *)p_dst;
|
||||
|
||||
int read = fa->get_buffer(dst, read_total);
|
||||
|
||||
return read;
|
||||
}
|
||||
|
||||
int AudioStreamPlaybackOGGVorbis::_ov_seek_func(void *_f,ogg_int64_t offs, int whence) {
|
||||
int AudioStreamPlaybackOGGVorbis::_ov_seek_func(void *_f, ogg_int64_t offs, int whence) {
|
||||
|
||||
//printf("seek to %p, offs %i, whence %i\n",_f,(int)offs,whence);
|
||||
//printf("seek to %p, offs %i, whence %i\n",_f,(int)offs,whence);
|
||||
|
||||
#ifdef SEEK_SET
|
||||
//printf("seek set defined\n");
|
||||
FileAccess *fa=(FileAccess*)_f;
|
||||
FileAccess *fa = (FileAccess *)_f;
|
||||
|
||||
if (whence==SEEK_SET) {
|
||||
if (whence == SEEK_SET) {
|
||||
|
||||
fa->seek(offs);
|
||||
} else if (whence==SEEK_CUR) {
|
||||
} else if (whence == SEEK_CUR) {
|
||||
|
||||
fa->seek(fa->get_pos()+offs);
|
||||
} else if (whence==SEEK_END) {
|
||||
fa->seek(fa->get_pos() + offs);
|
||||
} else if (whence == SEEK_END) {
|
||||
|
||||
fa->seek_end(offs);
|
||||
} else {
|
||||
|
||||
ERR_PRINT("BUG, wtf was whence set to?\n");
|
||||
}
|
||||
int ret=fa->eof_reached()?-1:0;
|
||||
int ret = fa->eof_reached() ? -1 : 0;
|
||||
//printf("returning %i\n",ret);
|
||||
return ret;
|
||||
|
||||
#else
|
||||
return -1; // no seeking
|
||||
#endif
|
||||
|
||||
}
|
||||
int AudioStreamPlaybackOGGVorbis::_ov_close_func(void *_f) {
|
||||
|
||||
//printf("close %p\n",_f);
|
||||
if (!_f)
|
||||
return 0;
|
||||
FileAccess *fa=(FileAccess*)_f;
|
||||
FileAccess *fa = (FileAccess *)_f;
|
||||
if (fa->is_open())
|
||||
fa->close();
|
||||
return 0;
|
||||
|
|
@ -90,40 +87,38 @@ long AudioStreamPlaybackOGGVorbis::_ov_tell_func(void *_f) {
|
|||
|
||||
//printf("close %p\n",_f);
|
||||
|
||||
FileAccess *fa=(FileAccess*)_f;
|
||||
FileAccess *fa = (FileAccess *)_f;
|
||||
return fa->get_pos();
|
||||
}
|
||||
|
||||
|
||||
|
||||
int AudioStreamPlaybackOGGVorbis::mix(int16_t* p_bufer,int p_frames) {
|
||||
int AudioStreamPlaybackOGGVorbis::mix(int16_t *p_bufer, int p_frames) {
|
||||
|
||||
if (!playing)
|
||||
return 0;
|
||||
|
||||
int total=p_frames;
|
||||
int total = p_frames;
|
||||
while (true) {
|
||||
|
||||
int todo = p_frames;
|
||||
|
||||
if (todo==0 || todo<MIN_MIX) {
|
||||
if (todo == 0 || todo < MIN_MIX) {
|
||||
break;
|
||||
}
|
||||
|
||||
//printf("to mix %i - mix me %i bytes\n",to_mix,to_mix*stream_channels*sizeof(int16_t));
|
||||
//printf("to mix %i - mix me %i bytes\n",to_mix,to_mix*stream_channels*sizeof(int16_t));
|
||||
|
||||
#ifdef BIG_ENDIAN_ENABLED
|
||||
long ret=ov_read(&vf,(char*)p_bufer,todo*stream_channels*sizeof(int16_t), 1, 2, 1, ¤t_section);
|
||||
#else
|
||||
long ret=ov_read(&vf,(char*)p_bufer,todo*stream_channels*sizeof(int16_t), 0, 2, 1, ¤t_section);
|
||||
#endif
|
||||
#ifdef BIG_ENDIAN_ENABLED
|
||||
long ret = ov_read(&vf, (char *)p_bufer, todo * stream_channels * sizeof(int16_t), 1, 2, 1, ¤t_section);
|
||||
#else
|
||||
long ret = ov_read(&vf, (char *)p_bufer, todo * stream_channels * sizeof(int16_t), 0, 2, 1, ¤t_section);
|
||||
#endif
|
||||
|
||||
if (ret<0) {
|
||||
if (ret < 0) {
|
||||
|
||||
playing = false;
|
||||
ERR_EXPLAIN("Error reading OGG Vorbis File: "+file);
|
||||
ERR_BREAK(ret<0);
|
||||
} else if (ret==0) { // end of song, reload?
|
||||
ERR_EXPLAIN("Error reading OGG Vorbis File: " + file);
|
||||
ERR_BREAK(ret < 0);
|
||||
} else if (ret == 0) { // end of song, reload?
|
||||
|
||||
ov_clear(&vf);
|
||||
|
||||
|
|
@ -131,65 +126,59 @@ int AudioStreamPlaybackOGGVorbis::mix(int16_t* p_bufer,int p_frames) {
|
|||
|
||||
if (!has_loop()) {
|
||||
|
||||
playing=false;
|
||||
repeats=1;
|
||||
playing = false;
|
||||
repeats = 1;
|
||||
break;
|
||||
}
|
||||
|
||||
f=FileAccess::open(file,FileAccess::READ);
|
||||
f = FileAccess::open(file, FileAccess::READ);
|
||||
|
||||
int errv = ov_open_callbacks(f,&vf,NULL,0,_ov_callbacks);
|
||||
if (errv!=0) {
|
||||
playing=false;
|
||||
int errv = ov_open_callbacks(f, &vf, NULL, 0, _ov_callbacks);
|
||||
if (errv != 0) {
|
||||
playing = false;
|
||||
break; // :(
|
||||
}
|
||||
|
||||
if (loop_restart_time) {
|
||||
bool ok = ov_time_seek(&vf,loop_restart_time)==0;
|
||||
bool ok = ov_time_seek(&vf, loop_restart_time) == 0;
|
||||
if (!ok) {
|
||||
playing=false;
|
||||
playing = false;
|
||||
//ERR_EXPLAIN("loop restart time rejected");
|
||||
ERR_PRINT("loop restart time rejected")
|
||||
}
|
||||
|
||||
frames_mixed=stream_srate*loop_restart_time;
|
||||
frames_mixed = stream_srate * loop_restart_time;
|
||||
} else {
|
||||
|
||||
frames_mixed=0;
|
||||
frames_mixed = 0;
|
||||
}
|
||||
repeats++;
|
||||
continue;
|
||||
|
||||
}
|
||||
|
||||
ret/=stream_channels;
|
||||
ret/=sizeof(int16_t);
|
||||
ret /= stream_channels;
|
||||
ret /= sizeof(int16_t);
|
||||
|
||||
frames_mixed+=ret;
|
||||
|
||||
p_bufer+=ret*stream_channels;
|
||||
p_frames-=ret;
|
||||
frames_mixed += ret;
|
||||
|
||||
p_bufer += ret * stream_channels;
|
||||
p_frames -= ret;
|
||||
}
|
||||
|
||||
return total-p_frames;
|
||||
|
||||
return total - p_frames;
|
||||
}
|
||||
|
||||
|
||||
|
||||
void AudioStreamPlaybackOGGVorbis::play(float p_from) {
|
||||
|
||||
if (playing)
|
||||
stop();
|
||||
|
||||
if (_load_stream()!=OK)
|
||||
if (_load_stream() != OK)
|
||||
return;
|
||||
|
||||
|
||||
frames_mixed=0;
|
||||
playing=true;
|
||||
if (p_from>0) {
|
||||
frames_mixed = 0;
|
||||
playing = true;
|
||||
if (p_from > 0) {
|
||||
seek_pos(p_from);
|
||||
}
|
||||
}
|
||||
|
|
@ -199,7 +188,7 @@ void AudioStreamPlaybackOGGVorbis::_close_file() {
|
|||
if (f) {
|
||||
|
||||
memdelete(f);
|
||||
f=NULL;
|
||||
f = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -209,39 +198,35 @@ bool AudioStreamPlaybackOGGVorbis::is_playing() const {
|
|||
void AudioStreamPlaybackOGGVorbis::stop() {
|
||||
|
||||
_clear_stream();
|
||||
playing=false;
|
||||
playing = false;
|
||||
//_clear();
|
||||
}
|
||||
|
||||
|
||||
|
||||
float AudioStreamPlaybackOGGVorbis::get_pos() const {
|
||||
|
||||
int32_t frames = int32_t(frames_mixed);
|
||||
if (frames < 0)
|
||||
frames=0;
|
||||
frames = 0;
|
||||
return double(frames) / stream_srate;
|
||||
}
|
||||
|
||||
void AudioStreamPlaybackOGGVorbis::seek_pos(float p_time) {
|
||||
|
||||
|
||||
|
||||
if (!playing)
|
||||
return;
|
||||
bool ok = ov_time_seek(&vf,p_time)==0;
|
||||
bool ok = ov_time_seek(&vf, p_time) == 0;
|
||||
ERR_FAIL_COND(!ok);
|
||||
frames_mixed=stream_srate*p_time;
|
||||
frames_mixed = stream_srate * p_time;
|
||||
}
|
||||
|
||||
String AudioStreamPlaybackOGGVorbis::get_stream_name() const {
|
||||
String AudioStreamPlaybackOGGVorbis::get_stream_name() const {
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
void AudioStreamPlaybackOGGVorbis::set_loop(bool p_enable) {
|
||||
|
||||
loops=p_enable;
|
||||
loops = p_enable;
|
||||
}
|
||||
|
||||
bool AudioStreamPlaybackOGGVorbis::has_loop() const {
|
||||
|
|
@ -253,99 +238,103 @@ int AudioStreamPlaybackOGGVorbis::get_loop_count() const {
|
|||
return repeats;
|
||||
}
|
||||
|
||||
Error AudioStreamPlaybackOGGVorbis::set_file(const String &p_file) {
|
||||
|
||||
Error AudioStreamPlaybackOGGVorbis::set_file(const String& p_file) {
|
||||
|
||||
file=p_file;
|
||||
stream_valid=false;
|
||||
file = p_file;
|
||||
stream_valid = false;
|
||||
Error err;
|
||||
f=FileAccess::open(file,FileAccess::READ,&err);
|
||||
f = FileAccess::open(file, FileAccess::READ, &err);
|
||||
|
||||
if (err) {
|
||||
ERR_FAIL_COND_V( err, err );
|
||||
ERR_FAIL_COND_V(err, err);
|
||||
}
|
||||
|
||||
int errv = ov_open_callbacks(f,&vf,NULL,0,_ov_callbacks);
|
||||
switch(errv) {
|
||||
int errv = ov_open_callbacks(f, &vf, NULL, 0, _ov_callbacks);
|
||||
switch (errv) {
|
||||
|
||||
case OV_EREAD: { // - A read from media returned an error.
|
||||
memdelete(f); f=NULL;
|
||||
ERR_FAIL_V( ERR_FILE_CANT_READ );
|
||||
memdelete(f);
|
||||
f = NULL;
|
||||
ERR_FAIL_V(ERR_FILE_CANT_READ);
|
||||
} break;
|
||||
case OV_EVERSION: // - Vorbis version mismatch.
|
||||
case OV_EVERSION: // - Vorbis version mismatch.
|
||||
case OV_ENOTVORBIS: { // - Bitstream is not Vorbis data.
|
||||
memdelete(f); f=NULL;
|
||||
ERR_FAIL_V( ERR_FILE_UNRECOGNIZED );
|
||||
memdelete(f);
|
||||
f = NULL;
|
||||
ERR_FAIL_V(ERR_FILE_UNRECOGNIZED);
|
||||
} break;
|
||||
case OV_EBADHEADER: { // - Invalid Vorbis bitstream header.
|
||||
memdelete(f); f=NULL;
|
||||
ERR_FAIL_V( ERR_FILE_CORRUPT );
|
||||
memdelete(f);
|
||||
f = NULL;
|
||||
ERR_FAIL_V(ERR_FILE_CORRUPT);
|
||||
} break;
|
||||
case OV_EFAULT: { // - Internal logic fault; indicates a bug or heap/stack corruption.
|
||||
memdelete(f); f=NULL;
|
||||
ERR_FAIL_V( ERR_BUG );
|
||||
memdelete(f);
|
||||
f = NULL;
|
||||
ERR_FAIL_V(ERR_BUG);
|
||||
} break;
|
||||
}
|
||||
const vorbis_info *vinfo=ov_info(&vf,-1);
|
||||
stream_channels=vinfo->channels;
|
||||
stream_srate=vinfo->rate;
|
||||
length = ov_time_total(&vf,-1);
|
||||
const vorbis_info *vinfo = ov_info(&vf, -1);
|
||||
stream_channels = vinfo->channels;
|
||||
stream_srate = vinfo->rate;
|
||||
length = ov_time_total(&vf, -1);
|
||||
ov_clear(&vf);
|
||||
memdelete(f);
|
||||
f=NULL;
|
||||
stream_valid=true;
|
||||
|
||||
f = NULL;
|
||||
stream_valid = true;
|
||||
|
||||
return OK;
|
||||
}
|
||||
|
||||
Error AudioStreamPlaybackOGGVorbis::_load_stream() {
|
||||
Error AudioStreamPlaybackOGGVorbis::_load_stream() {
|
||||
|
||||
ERR_FAIL_COND_V(!stream_valid,ERR_UNCONFIGURED);
|
||||
ERR_FAIL_COND_V(!stream_valid, ERR_UNCONFIGURED);
|
||||
|
||||
_clear_stream();
|
||||
if (file=="")
|
||||
if (file == "")
|
||||
return ERR_INVALID_DATA;
|
||||
|
||||
Error err;
|
||||
f=FileAccess::open(file,FileAccess::READ,&err);
|
||||
f = FileAccess::open(file, FileAccess::READ, &err);
|
||||
if (err) {
|
||||
ERR_FAIL_COND_V( err, err );
|
||||
ERR_FAIL_COND_V(err, err);
|
||||
}
|
||||
|
||||
int errv = ov_open_callbacks(f,&vf,NULL,0,_ov_callbacks);
|
||||
switch(errv) {
|
||||
int errv = ov_open_callbacks(f, &vf, NULL, 0, _ov_callbacks);
|
||||
switch (errv) {
|
||||
|
||||
case OV_EREAD: { // - A read from media returned an error.
|
||||
memdelete(f); f=NULL;
|
||||
ERR_FAIL_V( ERR_FILE_CANT_READ );
|
||||
memdelete(f);
|
||||
f = NULL;
|
||||
ERR_FAIL_V(ERR_FILE_CANT_READ);
|
||||
} break;
|
||||
case OV_EVERSION: // - Vorbis version mismatch.
|
||||
case OV_EVERSION: // - Vorbis version mismatch.
|
||||
case OV_ENOTVORBIS: { // - Bitstream is not Vorbis data.
|
||||
memdelete(f); f=NULL;
|
||||
ERR_FAIL_V( ERR_FILE_UNRECOGNIZED );
|
||||
memdelete(f);
|
||||
f = NULL;
|
||||
ERR_FAIL_V(ERR_FILE_UNRECOGNIZED);
|
||||
} break;
|
||||
case OV_EBADHEADER: { // - Invalid Vorbis bitstream header.
|
||||
memdelete(f); f=NULL;
|
||||
ERR_FAIL_V( ERR_FILE_CORRUPT );
|
||||
memdelete(f);
|
||||
f = NULL;
|
||||
ERR_FAIL_V(ERR_FILE_CORRUPT);
|
||||
} break;
|
||||
case OV_EFAULT: { // - Internal logic fault; indicates a bug or heap/stack corruption.
|
||||
memdelete(f); f=NULL;
|
||||
ERR_FAIL_V( ERR_BUG );
|
||||
memdelete(f);
|
||||
f = NULL;
|
||||
ERR_FAIL_V(ERR_BUG);
|
||||
} break;
|
||||
}
|
||||
repeats=0;
|
||||
stream_loaded=true;
|
||||
|
||||
repeats = 0;
|
||||
stream_loaded = true;
|
||||
|
||||
return OK;
|
||||
}
|
||||
|
||||
|
||||
float AudioStreamPlaybackOGGVorbis::get_length() const {
|
||||
|
||||
if (!stream_loaded) {
|
||||
if (const_cast<AudioStreamPlaybackOGGVorbis*>(this)->_load_stream()!=OK)
|
||||
if (const_cast<AudioStreamPlaybackOGGVorbis *>(this)->_load_stream() != OK)
|
||||
return 0;
|
||||
}
|
||||
return length;
|
||||
|
|
@ -359,14 +348,14 @@ void AudioStreamPlaybackOGGVorbis::_clear_stream() {
|
|||
ov_clear(&vf);
|
||||
_close_file();
|
||||
|
||||
stream_loaded=false;
|
||||
stream_loaded = false;
|
||||
//stream_channels=1;
|
||||
playing=false;
|
||||
playing = false;
|
||||
}
|
||||
|
||||
void AudioStreamPlaybackOGGVorbis::set_paused(bool p_paused) {
|
||||
|
||||
paused=p_paused;
|
||||
paused = p_paused;
|
||||
}
|
||||
|
||||
bool AudioStreamPlaybackOGGVorbis::is_paused(bool p_paused) const {
|
||||
|
|
@ -374,39 +363,34 @@ bool AudioStreamPlaybackOGGVorbis::is_paused(bool p_paused) const {
|
|||
return paused;
|
||||
}
|
||||
|
||||
|
||||
AudioStreamPlaybackOGGVorbis::AudioStreamPlaybackOGGVorbis() {
|
||||
|
||||
loops=false;
|
||||
playing=false;
|
||||
_ov_callbacks.read_func=_ov_read_func;
|
||||
_ov_callbacks.seek_func=_ov_seek_func;
|
||||
_ov_callbacks.close_func=_ov_close_func;
|
||||
_ov_callbacks.tell_func=_ov_tell_func;
|
||||
loops = false;
|
||||
playing = false;
|
||||
_ov_callbacks.read_func = _ov_read_func;
|
||||
_ov_callbacks.seek_func = _ov_seek_func;
|
||||
_ov_callbacks.close_func = _ov_close_func;
|
||||
_ov_callbacks.tell_func = _ov_tell_func;
|
||||
f = NULL;
|
||||
stream_loaded=false;
|
||||
stream_valid=false;
|
||||
repeats=0;
|
||||
paused=true;
|
||||
stream_channels=0;
|
||||
stream_srate=0;
|
||||
current_section=0;
|
||||
length=0;
|
||||
loop_restart_time=0;
|
||||
stream_loaded = false;
|
||||
stream_valid = false;
|
||||
repeats = 0;
|
||||
paused = true;
|
||||
stream_channels = 0;
|
||||
stream_srate = 0;
|
||||
current_section = 0;
|
||||
length = 0;
|
||||
loop_restart_time = 0;
|
||||
}
|
||||
|
||||
|
||||
AudioStreamPlaybackOGGVorbis::~AudioStreamPlaybackOGGVorbis() {
|
||||
|
||||
_clear_stream();
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
RES ResourceFormatLoaderAudioStreamOGGVorbis::load(const String &p_path, const String& p_original_path, Error *r_error) {
|
||||
RES ResourceFormatLoaderAudioStreamOGGVorbis::load(const String &p_path, const String &p_original_path, Error *r_error) {
|
||||
if (r_error)
|
||||
*r_error=OK;
|
||||
*r_error = OK;
|
||||
|
||||
AudioStreamOGGVorbis *ogg_stream = memnew(AudioStreamOGGVorbis);
|
||||
ogg_stream->set_file(p_path);
|
||||
|
|
@ -419,12 +403,11 @@ void ResourceFormatLoaderAudioStreamOGGVorbis::get_recognized_extensions(List<St
|
|||
}
|
||||
String ResourceFormatLoaderAudioStreamOGGVorbis::get_resource_type(const String &p_path) const {
|
||||
|
||||
if (p_path.get_extension().to_lower()=="ogg")
|
||||
if (p_path.get_extension().to_lower() == "ogg")
|
||||
return "AudioStreamOGGVorbis";
|
||||
return "";
|
||||
}
|
||||
|
||||
bool ResourceFormatLoaderAudioStreamOGGVorbis::handles_type(const String& p_type) const {
|
||||
return (p_type=="AudioStream" || p_type=="AudioStreamOGG" || p_type=="AudioStreamOGGVorbis");
|
||||
bool ResourceFormatLoaderAudioStreamOGGVorbis::handles_type(const String &p_type) const {
|
||||
return (p_type == "AudioStream" || p_type == "AudioStreamOGG" || p_type == "AudioStreamOGGVorbis");
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue