Style update: add spaces around assignments

[libs/al.git] / source / sound.cpp

diff --git a/source/sound.cpp b/source/sound.cpp
index 15596053309f2ba436da99e3bd6bba69b4f892b4..9ac1143e32f2b8206d50db4c51e234bdcd4e7331 100644 (file)
--- a/source/sound.cpp
+++ b/source/sound.cpp
@@ -24,24 +24,24 @@ struct MemorySource
 
 size_t memory_read(void *ptr, size_t size, size_t nmemb, void *src)
 {
-       MemorySource &memsrc=*reinterpret_cast<MemorySource *>(src);
-       unsigned len=min(size*nmemb, memsrc.length-memsrc.pos);
+       MemorySource &memsrc = *reinterpret_cast<MemorySource *>(src);
+       unsigned len = min(size*nmemb, memsrc.length-memsrc.pos);
        memcpy(ptr, reinterpret_cast<const char *>(memsrc.data)+memsrc.pos, len);
-       memsrc.pos+=len;
+       memsrc.pos += len;
 
        return len/size;
 }
 
 int memory_seek(void *src, ogg_int64_t offset, int whence)
 {
-       MemorySource &memsrc=*reinterpret_cast<MemorySource *>(src);
+       MemorySource &memsrc = *reinterpret_cast<MemorySource *>(src);
        if(whence==SEEK_SET)
-               memsrc.pos=offset;
+               memsrc.pos = offset;
        else if(whence==SEEK_CUR)
-               memsrc.pos+=offset;
+               memsrc.pos += offset;
        else if(whence==SEEK_END)
-               memsrc.pos=memsrc.length-offset;
-       memsrc.pos=min(memsrc.pos, memsrc.length);
+               memsrc.pos = memsrc.length-offset;
+       memsrc.pos = min(memsrc.pos, memsrc.length);
 
        return memsrc.pos;
 }
@@ -54,7 +54,7 @@ int memory_close(void *src)
 
 long memory_tell(void *src)
 {
-       MemorySource &memsrc=*reinterpret_cast<MemorySource *>(src);
+       MemorySource &memsrc = *reinterpret_cast<MemorySource *>(src);
        return memsrc.pos;
 }
 
@@ -75,7 +75,7 @@ Sound::Sound():
        data(0),
        eof_flag(false)
 {
-       ovfile.datasource=0;
+       ovfile.datasource = 0;
 }
 
 Sound::~Sound()
@@ -100,7 +100,7 @@ void Sound::open_memory(const void *d, unsigned len)
        if(ovfile.datasource)
                throw InvalidState("Sound has already been opened");
 
-       MemorySource *src=new MemorySource(d, len);
+       MemorySource *src = new MemorySource(d, len);
        if(ov_open_callbacks(src, &ovfile, 0, 0, memory_callbacks)<0)
        {
                delete src;
@@ -115,14 +115,14 @@ void Sound::load_data()
        if(data)
                throw InvalidState("Data has already been loaded");
 
-       size=ov_pcm_total(&ovfile, 0)*4;
-       char *dptr=new char[size];
-       unsigned pos=0;
-       while(unsigned len=read(dptr+pos, size-pos))
-               pos+=len;
-       data=dptr;
-       size=pos;
-       read_pos=0;
+       size = ov_pcm_total(&ovfile, 0)*4;
+       char *dptr = new char[size];
+       unsigned pos = 0;
+       while(unsigned len = read(dptr+pos, size-pos))
+               pos += len;
+       data = dptr;
+       size = pos;
+       read_pos = 0;
 }
 
 void Sound::load_file(const std::string &fn)
@@ -148,7 +148,7 @@ void Sound::close()
 void Sound::rewind()
 {
        if(data)
-               read_pos=0;
+               read_pos = 0;
        else
                ov_pcm_seek(&ovfile, 0);
 }
@@ -157,19 +157,19 @@ unsigned Sound::read(char *buf, unsigned len)
 {
        if(data)
        {
-               len=min(len, size-read_pos);
+               len = min(len, size-read_pos);
                memcpy(buf, data+read_pos, len);
-               read_pos+=len;
+               read_pos += len;
                return len;
        }
        else if(ovfile.datasource)
        {
-               int section=0;
-               int res=ov_read(&ovfile, buf, len, 0, 2, 1, &section);
+               int section = 0;
+               int res = ov_read(&ovfile, buf, len, 0, 2, 1, &section);
                if(res<0)
                        throw Exception("Error reading ogg vorbis file");
                else if(res==0)
-                       eof_flag=true;
+                       eof_flag = true;
                return res;
        }
        else
@@ -186,14 +186,14 @@ const char *Sound::get_data() const
 void Sound::open_common()
 {
        delete data;
-       data=0;
+       data = 0;
 
-       vorbis_info *info=ov_info(&ovfile, -1);
-       freq=info->rate;
+       vorbis_info *info = ov_info(&ovfile, -1);
+       freq = info->rate;
        switch(info->channels)
        {
-       case 1: format=MONO16; break;
-       case 2: format=STEREO16; break;
+       case 1: format = MONO16; break;
+       case 2: format = STEREO16; break;
        default: throw Exception("Unsupported number of channels");
        }
 }