From 5dbf1809c6e3e905b94b8764e99491e608122261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sun, 5 Mar 2017 16:44:50 +0100 Subject: 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 --- modules/vorbis/audio_stream_ogg_vorbis.cpp | 269 ++++++++++++++--------------- modules/vorbis/audio_stream_ogg_vorbis.h | 35 ++-- modules/vorbis/register_types.cpp | 4 +- 3 files changed, 142 insertions(+), 166 deletions(-) (limited to 'modules/vorbis') diff --git a/modules/vorbis/audio_stream_ogg_vorbis.cpp b/modules/vorbis/audio_stream_ogg_vorbis.cpp index 98920954a4..88c8ecc0df 100644 --- a/modules/vorbis/audio_stream_ogg_vorbis.cpp +++ b/modules/vorbis/audio_stream_ogg_vorbis.cpp @@ -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 || todo0) { + 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(this)->_load_stream()!=OK) + if (const_cast(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 instance_playback() { - Ref pb = memnew( AudioStreamPlaybackOGGVorbis ); + Ref pb = memnew(AudioStreamPlaybackOGGVorbis); pb->set_file(file); return pb; } - void set_file(const String& p_file) { file=p_file; } - + void set_file(const String &p_file) { file = p_file; } }; class ResourceFormatLoaderAudioStreamOGGVorbis : public ResourceFormatLoader { public: - virtual RES load(const String &p_path,const String& p_original_path="",Error *r_error=NULL); + virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL); virtual void get_recognized_extensions(List *p_extensions) const; - virtual bool handles_type(const String& p_type) const; + virtual bool handles_type(const String &p_type) const; virtual String get_resource_type(const String &p_path) const; }; - #endif // AUDIO_STREAM_OGG_H diff --git a/modules/vorbis/register_types.cpp b/modules/vorbis/register_types.cpp index de929d9350..b405acd16b 100644 --- a/modules/vorbis/register_types.cpp +++ b/modules/vorbis/register_types.cpp @@ -34,12 +34,12 @@ static ResourceFormatLoaderAudioStreamOGGVorbis *vorbis_stream_loader = NULL; void register_vorbis_types() { - vorbis_stream_loader = memnew( ResourceFormatLoaderAudioStreamOGGVorbis ); + vorbis_stream_loader = memnew(ResourceFormatLoaderAudioStreamOGGVorbis); ResourceLoader::add_resource_format_loader(vorbis_stream_loader); ClassDB::register_class(); } void unregister_vorbis_types() { - memdelete( vorbis_stream_loader ); + memdelete(vorbis_stream_loader); } -- cgit v1.2.3