godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +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

210
modules/mpc/audio_stream_mpc.cpp
View File

@@ -28,42 +28,40 @@
/*************************************************************************/
#include "audio_stream_mpc.h"
Error AudioStreamPlaybackMPC::_open_file() {
if (f) {
memdelete(f);
f=NULL;
f = NULL;
}
Error err;
//printf("mpc open file %ls\n", file.c_str());
f=FileAccess::open(file,FileAccess::READ,&err);
f = FileAccess::open(file, FileAccess::READ, &err);
if (err) {
f=NULL;
f = NULL;
ERR_FAIL_V(err);
return err;
}
//printf("file size is %i\n", f->get_len());
//f->seek_end(0);
streamlen=f->get_len();
streamlen = f->get_len();
//f->seek(0);
if (streamlen<=0) {
if (streamlen <= 0) {
memdelete(f);
f=NULL;
f = NULL;
ERR_FAIL_V(ERR_INVALID_DATA);
}
data_ofs=0;
data_ofs = 0;
if (preload) {
data.resize(streamlen);
DVector<uint8_t>::Write w = data.write();
f->get_buffer(&w[0],streamlen);
f->get_buffer(&w[0], streamlen);
memdelete(f);
f=NULL;
f = NULL;
}
return OK;
@@ -73,32 +71,32 @@ void AudioStreamPlaybackMPC::_close_file() {
if (f) {
memdelete(f);
f=NULL;
f = NULL;
}
data.resize(0);
streamlen=0;
data_ofs=0;
streamlen = 0;
data_ofs = 0;
}
int AudioStreamPlaybackMPC::_read_file(void *p_dst,int p_bytes) {
int AudioStreamPlaybackMPC::_read_file(void *p_dst, int p_bytes) {
if (f)
return f->get_buffer((uint8_t*)p_dst,p_bytes);
return f->get_buffer((uint8_t *)p_dst, p_bytes);
DVector<uint8_t>::Read r = data.read();
if (p_bytes+data_ofs > streamlen) {
p_bytes=streamlen-data_ofs;
if (p_bytes + data_ofs > streamlen) {
p_bytes = streamlen - data_ofs;
}
copymem(p_dst,&r[data_ofs],p_bytes);
copymem(p_dst, &r[data_ofs], p_bytes);
//print_line("read file: "+itos(p_bytes));
data_ofs+=p_bytes;
data_ofs += p_bytes;
return p_bytes;
}
bool AudioStreamPlaybackMPC::_seek_file(int p_pos){
bool AudioStreamPlaybackMPC::_seek_file(int p_pos) {
if (p_pos<0 || p_pos>streamlen)
if (p_pos < 0 || p_pos > streamlen)
return false;
if (f) {
@@ -107,27 +105,25 @@ bool AudioStreamPlaybackMPC::_seek_file(int p_pos){
}
//print_line("read file to: "+itos(p_pos));
data_ofs=p_pos;
data_ofs = p_pos;
return true;
}
int AudioStreamPlaybackMPC::_tell_file() const{
int AudioStreamPlaybackMPC::_tell_file() const {
if (f)
return f->get_pos();
//print_line("tell file, get: "+itos(data_ofs));
return data_ofs;
}
int AudioStreamPlaybackMPC::_sizeof_file() const{
int AudioStreamPlaybackMPC::_sizeof_file() const {
//print_line("sizeof file, get: "+itos(streamlen));
return streamlen;
}
bool AudioStreamPlaybackMPC::_canseek_file() const{
bool AudioStreamPlaybackMPC::_canseek_file() const {
//print_line("canseek file, get true");
return true;
@@ -135,81 +131,73 @@ bool AudioStreamPlaybackMPC::_canseek_file() const{
/////////////////////
mpc_int32_t AudioStreamPlaybackMPC::_mpc_read(mpc_reader *p_reader,void *p_dst, mpc_int32_t p_bytes) {
mpc_int32_t AudioStreamPlaybackMPC::_mpc_read(mpc_reader *p_reader, void *p_dst, mpc_int32_t p_bytes) {
AudioStreamPlaybackMPC *smpc=(AudioStreamPlaybackMPC *)p_reader->data;
return smpc->_read_file(p_dst,p_bytes);
AudioStreamPlaybackMPC *smpc = (AudioStreamPlaybackMPC *)p_reader->data;
return smpc->_read_file(p_dst, p_bytes);
}
mpc_bool_t AudioStreamPlaybackMPC::_mpc_seek(mpc_reader *p_reader,mpc_int32_t p_offset) {
mpc_bool_t AudioStreamPlaybackMPC::_mpc_seek(mpc_reader *p_reader, mpc_int32_t p_offset) {
AudioStreamPlaybackMPC *smpc=(AudioStreamPlaybackMPC *)p_reader->data;
AudioStreamPlaybackMPC *smpc = (AudioStreamPlaybackMPC *)p_reader->data;
return smpc->_seek_file(p_offset);
}
mpc_int32_t AudioStreamPlaybackMPC::_mpc_tell(mpc_reader *p_reader) {
AudioStreamPlaybackMPC *smpc=(AudioStreamPlaybackMPC *)p_reader->data;
AudioStreamPlaybackMPC *smpc = (AudioStreamPlaybackMPC *)p_reader->data;
return smpc->_tell_file();
}
mpc_int32_t AudioStreamPlaybackMPC::_mpc_get_size(mpc_reader *p_reader) {
AudioStreamPlaybackMPC *smpc=(AudioStreamPlaybackMPC *)p_reader->data;
AudioStreamPlaybackMPC *smpc = (AudioStreamPlaybackMPC *)p_reader->data;
return smpc->_sizeof_file();
}
mpc_bool_t AudioStreamPlaybackMPC::_mpc_canseek(mpc_reader *p_reader) {
AudioStreamPlaybackMPC *smpc=(AudioStreamPlaybackMPC *)p_reader->data;
AudioStreamPlaybackMPC *smpc = (AudioStreamPlaybackMPC *)p_reader->data;
return smpc->_canseek_file();
}
int AudioStreamPlaybackMPC::mix(int16_t* p_bufer,int p_frames) {
int AudioStreamPlaybackMPC::mix(int16_t *p_bufer, int p_frames) {
if (!active || paused)
return 0;
int todo=p_frames;
int todo = p_frames;
while(todo>MPC_DECODER_BUFFER_LENGTH/si.channels) {
while (todo > MPC_DECODER_BUFFER_LENGTH / si.channels) {
mpc_frame_info frame;
frame.buffer=sample_buffer;
frame.buffer = sample_buffer;
mpc_status err = mpc_demux_decode(demux, &frame);
if (frame.bits!=-1) {
if (frame.bits != -1) {
int16_t *dst_buff = p_bufer;
#ifdef MPC_FIXED_POINT
for( int i = 0; i < frame.samples * si.channels; i++) {
for (int i = 0; i < frame.samples * si.channels; i++) {
int tmp = sample_buffer[i] >> MPC_FIXED_POINT_FRACTPART;
if (tmp > ((1 << 15) - 1)) tmp = ((1 << 15) - 1);
if (tmp < -(1 << 15)) tmp = -(1 << 15);
dst_buff[i] = tmp;
}
#else
for( int i = 0; i < frame.samples * si.channels; i++) {
for (int i = 0; i < frame.samples * si.channels; i++) {
int tmp = Math::fast_ftoi(sample_buffer[i]*32767.0);
int tmp = Math::fast_ftoi(sample_buffer[i] * 32767.0);
if (tmp > ((1 << 15) - 1)) tmp = ((1 << 15) - 1);
if (tmp < -(1 << 15)) tmp = -(1 << 15);
dst_buff[i] = tmp;
}
#endif
int frames = frame.samples;
p_bufer+=si.channels*frames;
todo-=frames;
p_bufer += si.channels * frames;
todo -= frames;
} else {
if (err != MPC_STATUS_OK) {
@@ -225,101 +213,91 @@ int AudioStreamPlaybackMPC::mix(int16_t* p_bufer,int p_frames) {
break;
} else {
loops++;
mpc_demux_exit(demux);
_seek_file(0);
demux = mpc_demux_init(&reader);
//do loop somehow
}
}
}
}
return p_frames-todo;
return p_frames - todo;
}
Error AudioStreamPlaybackMPC::_reload() {
ERR_FAIL_COND_V(demux!=NULL, ERR_FILE_ALREADY_IN_USE);
ERR_FAIL_COND_V(demux != NULL, ERR_FILE_ALREADY_IN_USE);
Error err = _open_file();
ERR_FAIL_COND_V(err!=OK,ERR_CANT_OPEN);
ERR_FAIL_COND_V(err != OK, ERR_CANT_OPEN);
demux = mpc_demux_init(&reader);
ERR_FAIL_COND_V(!demux,ERR_CANT_CREATE);
mpc_demux_get_info(demux, &si);
ERR_FAIL_COND_V(!demux, ERR_CANT_CREATE);
mpc_demux_get_info(demux, &si);
return OK;
}
void AudioStreamPlaybackMPC::set_file(const String& p_file) {
void AudioStreamPlaybackMPC::set_file(const String &p_file) {
file=p_file;
file = p_file;
Error err = _open_file();
ERR_FAIL_COND(err!=OK);
ERR_FAIL_COND(err != OK);
demux = mpc_demux_init(&reader);
ERR_FAIL_COND(!demux);
mpc_demux_get_info(demux, &si);
stream_min_size=MPC_DECODER_BUFFER_LENGTH*2/si.channels;
stream_rate=si.sample_freq;
stream_channels=si.channels;
mpc_demux_get_info(demux, &si);
stream_min_size = MPC_DECODER_BUFFER_LENGTH * 2 / si.channels;
stream_rate = si.sample_freq;
stream_channels = si.channels;
mpc_demux_exit(demux);
demux=NULL;
demux = NULL;
_close_file();
}
String AudioStreamPlaybackMPC::get_file() const {
return file;
}
void AudioStreamPlaybackMPC::play(float p_offset) {
if (active)
stop();
active=false;
active = false;
Error err = _open_file();
ERR_FAIL_COND(err!=OK);
if (_reload()!=OK)
ERR_FAIL_COND(err != OK);
if (_reload() != OK)
return;
active=true;
loops=0;
active = true;
loops = 0;
}
void AudioStreamPlaybackMPC::stop() {
void AudioStreamPlaybackMPC::stop() {
if (!active)
return;
if (demux) {
mpc_demux_exit(demux);
demux=NULL;
demux = NULL;
}
_close_file();
active=false;
active = false;
}
bool AudioStreamPlaybackMPC::is_playing() const {
bool AudioStreamPlaybackMPC::is_playing() const {
return active;
}
void AudioStreamPlaybackMPC::set_loop(bool p_enable) {
void AudioStreamPlaybackMPC::set_loop(bool p_enable) {
loop=p_enable;
loop = p_enable;
}
bool AudioStreamPlaybackMPC::has_loop() const {
bool AudioStreamPlaybackMPC::has_loop() const {
return loop;
}
@@ -344,38 +322,33 @@ float AudioStreamPlaybackMPC::get_pos() const {
return 0;
}
void AudioStreamPlaybackMPC::seek_pos(float p_time) {
}
void AudioStreamPlaybackMPC::_bind_methods() {
ObjectTypeDB::bind_method(_MD("set_file","name"),&AudioStreamPlaybackMPC::set_file);
ObjectTypeDB::bind_method(_MD("get_file"),&AudioStreamPlaybackMPC::get_file);
ADD_PROPERTYNZ( PropertyInfo(Variant::STRING,"file",PROPERTY_HINT_FILE,"mpc"), _SCS("set_file"), _SCS("get_file"));
ObjectTypeDB::bind_method(_MD("set_file", "name"), &AudioStreamPlaybackMPC::set_file);
ObjectTypeDB::bind_method(_MD("get_file"), &AudioStreamPlaybackMPC::get_file);
ADD_PROPERTYNZ(PropertyInfo(Variant::STRING, "file", PROPERTY_HINT_FILE, "mpc"), _SCS("set_file"), _SCS("get_file"));
}
AudioStreamPlaybackMPC::AudioStreamPlaybackMPC() {
preload=false;
f=NULL;
streamlen=0;
data_ofs=0;
active=false;
paused=false;
loop=false;
demux=NULL;
reader.data=this;
reader.read=_mpc_read;
reader.seek=_mpc_seek;
reader.tell=_mpc_tell;
reader.get_size=_mpc_get_size;
reader.canseek=_mpc_canseek;
loops=0;
preload = false;
f = NULL;
streamlen = 0;
data_ofs = 0;
active = false;
paused = false;
loop = false;
demux = NULL;
reader.data = this;
reader.read = _mpc_read;
reader.seek = _mpc_seek;
reader.tell = _mpc_tell;
reader.get_size = _mpc_get_size;
reader.canseek = _mpc_canseek;
loops = 0;
}
AudioStreamPlaybackMPC::~AudioStreamPlaybackMPC() {
@@ -386,11 +359,9 @@ AudioStreamPlaybackMPC::~AudioStreamPlaybackMPC() {
memdelete(f);
}
RES ResourceFormatLoaderAudioStreamMPC::load(const String &p_path, const String& p_original_path, Error *r_error) {
RES ResourceFormatLoaderAudioStreamMPC::load(const String &p_path, const String &p_original_path, Error *r_error) {
if (r_error)
*r_error=OK; //streamed so it will always work..
*r_error = OK; //streamed so it will always work..
AudioStreamMPC *mpc_stream = memnew(AudioStreamMPC);
mpc_stream->set_file(p_path);
return Ref<AudioStreamMPC>(mpc_stream);
@@ -400,15 +371,14 @@ void ResourceFormatLoaderAudioStreamMPC::get_recognized_extensions(List<String>
p_extensions->push_back("mpc");
}
bool ResourceFormatLoaderAudioStreamMPC::handles_type(const String& p_type) const {
bool ResourceFormatLoaderAudioStreamMPC::handles_type(const String &p_type) const {
return (p_type=="AudioStream") || (p_type=="AudioStreamMPC");
return (p_type == "AudioStream") || (p_type == "AudioStreamMPC");
}
String ResourceFormatLoaderAudioStreamMPC::get_resource_type(const String &p_path) const {
if (p_path.extension().to_lower()=="mpc")
if (p_path.extension().to_lower() == "mpc")
return "AudioStreamMPC";
return "";
}