diff options
-rw-r--r-- | sound/mp3.cpp | 18 | ||||
-rw-r--r-- | sound/vorbis.cpp | 82 |
2 files changed, 49 insertions, 51 deletions
diff --git a/sound/mp3.cpp b/sound/mp3.cpp index e4f98c587d..f70a7c3bf7 100644 --- a/sound/mp3.cpp +++ b/sound/mp3.cpp @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * $Header$ * @@ -92,7 +92,7 @@ MP3InputStream::MP3InputStream(File *file, mad_timer_t duration) { #if defined(__SYMBIAN32__) // Symbian can't share filehandles between different threads. // So create a new file and seek that to the other filehandles position - _file= new (ELeave)File; + _file= new File; _file->open(file->name()); _file->seek(file->pos()); #else @@ -123,7 +123,7 @@ MP3InputStream::MP3InputStream(File *file, uint32 size) { #if defined(__SYMBIAN32__) // Symbian can't share filehandles between different threads. // So create a new file and seek that to the other filehandles position - _file= new (ELeave)File; + _file= new File; _file->open(file->name()); _file->seek(file->pos()); #else @@ -138,9 +138,9 @@ MP3InputStream::MP3InputStream(File *file, uint32 size) { // If a size is specified, we do not perform any further read operations if (size) { #ifdef __SYMBIAN32__ - delete _file; + delete _file; #endif - _file = 0; + _file = NULL; } else { _file->incRef(); } @@ -205,7 +205,7 @@ void MP3InputStream::refill(bool first) { #ifdef __SYMBIAN32__ // For symbian we must check that an alternative file pointer is created, see if its open // If not re-open file and seek to the last read position - if(_file && !_file->isOpen()){ + if(_file && !_file->isOpen()) { _file->open(_file->name()); _file->seek(_lastReadPosition); } @@ -267,10 +267,10 @@ void MP3InputStream::refill(bool first) { #ifdef __SYMBIAN32__ // For symbian we now store the last read position and then close the file - if(_file){ - _lastReadPosition=_file->pos(); + if(_file) { + _lastReadPosition = _file->pos(); _file->close(); - } + } #endif } diff --git a/sound/vorbis.cpp b/sound/vorbis.cpp index 6466ef23de..08bb1f230a 100644 --- a/sound/vorbis.cpp +++ b/sound/vorbis.cpp @@ -74,15 +74,14 @@ static size_t read_wrap(void *ptr, size_t size, size_t nmemb, void *datasource) int result; #ifdef __SYMBIAN32__ - // For symbian we must check that an alternative file pointer is created, see if its open - // If not re-open file and seek to the last read position - if(f->file && !f->file->isOpen()){ - f->file->open(f->file->name()); - f->file->seek(f->curr_pos); - } + // For symbian we must check that an alternative file pointer is created, see if its open + // If not re-open file and seek to the last read position + if (f->file && !f->file->isOpen()) { + f->file->open(f->file->name()); + f->file->seek(f->curr_pos); + } #endif - nmemb *= size; if (f->curr_pos > (int) f->len) nmemb = 0; @@ -93,10 +92,10 @@ static size_t read_wrap(void *ptr, size_t size, size_t nmemb, void *datasource) f->file->seek(f->start + f->curr_pos); result = f->file->read(ptr, nmemb); #ifdef __SYMBIAN32__ - // For symbian we now store the last read position and then close the file - if(f->file){ - f->file->close(); - } + // For symbian we now store the last read position and then close the file + if (f->file) { + f->file->close(); + } #endif if (result == -1) { f->curr_pos = f->file->pos() - f->start; @@ -118,12 +117,12 @@ static int seek_wrap(void *datasource, ogg_int64_t offset, int whence) { } #ifdef __SYMBIAN32__ - // For symbian we must check that an alternative file pointer is created, see if its open - // If not re-open file and seek to the last read position - if(f->file && !f->file->isOpen()){ - f->file->open(f->file->name()); - f->file->seek(f->curr_pos); - } + // For symbian we must check that an alternative file pointer is created, see if its open + // If not re-open file and seek to the last read position + if (f->file && !f->file->isOpen()) { + f->file->open(f->file->name()); + f->file->seek(f->curr_pos); + } #endif f->file->seek(offset, whence); @@ -131,9 +130,9 @@ static int seek_wrap(void *datasource, ogg_int64_t offset, int whence) { #ifdef __SYMBIAN32__ // For symbian we now store the last read position and then close the file - if(f->file){ - f->file->close(); - } + if (f->file) { + f->file->close(); + } #endif return f->curr_pos; @@ -180,13 +179,13 @@ debug(5, "" __FILE__ ":%i", __LINE__); file_info *f = new file_info; #if defined(__SYMBIAN32__) - // Symbian can't share filehandles between different threads. - // So create a new file and seek that to the other filehandles position - f->file= new (ELeave)File; - f->file->open(_file->name()); - f->file->seek(_file->pos()); + // Symbian can't share filehandles between different threads. + // So create a new file and seek that to the other filehandles position + f->file = new File; + f->file->open(_file->name()); + f->file->seek(_file->pos()); #else - f->file = _file; + f->file = _file; #endif f->start = 0; @@ -197,14 +196,14 @@ debug(5, "" __FILE__ ":%i", __LINE__); bool err = (ov_open_callbacks((void *) f, &_ov_file, NULL, 0, g_File_wrap) < 0); if (err) { #ifdef __SYMBIAN32__ - delete f->file; + delete f->file; #endif delete f; } else { #ifndef __SYMBIAN32__ - _file->incRef(); + _file->incRef(); #endif - } + } return err; } @@ -224,9 +223,9 @@ debug(5, "" __FILE__ ":%i", __LINE__); #ifdef USE_TREMOR // In Tremor, the ov_time_seek() and ov_time_seek_page() calls take seeking positions in milliseconds as 64 bit integers, rather than in seconds as doubles as in Vorbisfile. #if defined(__SYMBIAN32__) && defined(__GCC32__) // SumthinWicked says: fixing "relocation truncated to fit: ARM_26 __fixdfdi" during linking on GCC, see portdefs.h - ov_time_seek(&_ov_file, (ogg_int64_t)scumm_fixdfdi(startFrame / 75.0 * 1000)); + ov_time_seek(&_ov_file, (ogg_int64_t)scumm_fixdfdi(startFrame / 75.0 * 1000)); #else - ov_time_seek(&_ov_file, (ogg_int64_t)(startFrame / 75.0 * 1000)); + ov_time_seek(&_ov_file, (ogg_int64_t)(startFrame / 75.0 * 1000)); #endif #else ov_time_seek(&_ov_file, startFrame / 75.0); @@ -380,13 +379,13 @@ debug(5, "" __FILE__ ":%i", __LINE__); file_info *f = new file_info; #if defined(__SYMBIAN32__) - // Symbian can't share filehandles between different threads. - // So create a new file and seek that to the other filehandles position - f->file= new (ELeave)File; - f->file->open(file->name()); - f->file->seek(file->pos()); + // Symbian can't share filehandles between different threads. + // So create a new file and seek that to the other filehandles position + f->file = new File; + f->file->open(file->name()); + f->file->seek(file->pos()); #else - f->file = file; + f->file = file; #endif f->start = file->pos(); f->len = size; @@ -399,10 +398,9 @@ debug(5, "" __FILE__ ":%i", __LINE__); return 0; } else { #ifndef __SYMBIAN32__ - file->incRef(); + file->incRef(); #endif - return new VorbisInputStream(ov_file, 0, true); - } - } - + return new VorbisInputStream(ov_file, 0, true); + } + } #endif |