Index: Playlist.m =================================================================== RCS file: /sources/gap/gap/user-apps/Cynthiune/Playlist.m,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 Playlist.m --- Playlist.m 25 Mar 2012 07:48:02 -0000 1.1.1.1 +++ Playlist.m 13 May 2012 08:10:39 -0000 @@ -396,7 +396,7 @@ realList = ((shuffleList) ? shuffleList : list); - return [self _nextValidSongInEnumerator: [list reverseObjectEnumerator]]; + return [self _nextValidSongInEnumerator: [realList reverseObjectEnumerator]]; } - (Song *) songAfter: (Song *) song Index: Song.m =================================================================== RCS file: /sources/gap/gap/user-apps/Cynthiune/Song.m,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 Song.m --- Song.m 25 Mar 2012 07:47:48 -0000 1.1.1.1 +++ Song.m 13 May 2012 08:10:39 -0000 @@ -360,12 +360,12 @@ writingClasses = [self _tagsClassesForProtocol: @protocol (TagsWriting)]; writingClass = [writingClasses nextObject]; while (writingClass - && ![NSClassFromString (writingClass) setTitle: newTitle - artist: newArtist - album: newAlbum - trackNumber: newTrackNumber - genre: newGenre - year: newYear + && ![NSClassFromString (writingClass) setTitle: savedTitle + artist: savedArtist + album: savedAlbum + trackNumber: savedTrackNumber + genre: savedGenre + year: savedYear ofFilename: filename]) writingClass = [writingClasses nextObject]; } Index: Bundles/Esound/Esound.m =================================================================== RCS file: /sources/gap/gap/user-apps/Cynthiune/Bundles/Esound/Esound.m,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 Esound.m --- Bundles/Esound/Esound.m 25 Mar 2012 07:48:24 -0000 1.1.1.1 +++ Bundles/Esound/Esound.m 13 May 2012 08:10:39 -0000 @@ -157,6 +157,7 @@ - (BOOL) prepareDeviceWithChannels: (unsigned int) numberOfChannels andRate: (unsigned long) sampleRate + withEndianness: (Endianness) e { BOOL result; Index: Bundles/Esound/EsoundPreference.m =================================================================== RCS file: /sources/gap/gap/user-apps/Cynthiune/Bundles/Esound/EsoundPreference.m,v retrieving revision 1.2 diff -u -r1.2 EsoundPreference.m --- Bundles/Esound/EsoundPreference.m 25 Mar 2012 09:44:59 -0000 1.2 +++ Bundles/Esound/EsoundPreference.m 13 May 2012 08:10:39 -0000 @@ -30,6 +30,8 @@ #import #import +#import +#import #import #import Index: Bundles/FLAC/FLAC.m =================================================================== RCS file: /sources/gap/gap/user-apps/Cynthiune/Bundles/FLAC/FLAC.m,v retrieving revision 1.2 diff -u -r1.2 FLAC.m --- Bundles/FLAC/FLAC.m 25 Mar 2012 08:59:46 -0000 1.2 +++ Bundles/FLAC/FLAC.m 13 May 2012 08:10:39 -0000 @@ -286,6 +286,11 @@ return rate; } +- (Endianness) endianness +{ + return LittleEndian; +} + - (unsigned int) readDuration { return duration; Index: Bundles/Mod/Mod.m =================================================================== RCS file: /sources/gap/gap/user-apps/Cynthiune/Bundles/Mod/Mod.m,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 Mod.m --- Bundles/Mod/Mod.m 25 Mar 2012 07:48:26 -0000 1.1.1.1 +++ Bundles/Mod/Mod.m 13 May 2012 08:10:39 -0000 @@ -142,6 +142,11 @@ return FRAME_RATE; } +- (Endianness) endianness +{ + return LittleEndian; +} + - (unsigned int) readDuration { return (ModPlug_GetLength (_mp_file) / 1000); Index: Bundles/Musepack/Musepack.m =================================================================== RCS file: /sources/gap/gap/user-apps/Cynthiune/Bundles/Musepack/Musepack.m,v retrieving revision 1.2 diff -u -r1.2 Musepack.m --- Bundles/Musepack/Musepack.m 29 Apr 2012 15:23:35 -0000 1.2 +++ Bundles/Musepack/Musepack.m 13 May 2012 08:10:39 -0000 @@ -218,9 +218,10 @@ { NSFileHandle *testFileHandle; mpc_reader *testReader; - mpc_streaminfo *testStreamInfo; #ifndef MUSEPACK_API_126 mpc_demux *testDecoder; +#else + mpc_streaminfo *testStreamInfo; #endif BOOL result; @@ -228,8 +229,8 @@ if (testFileHandle) { testReader = MPCReaderNew (testFileHandle); - testStreamInfo = MPCStreamInfoNew (); #ifdef MUSEPACK_API_126 + testStreamInfo = MPCStreamInfoNew (); result = !mpc_streaminfo_read (testStreamInfo, testReader); free (testStreamInfo); MPCReaderDelete (testReader); @@ -341,6 +342,11 @@ return mpcStreamInfo->sample_freq; } +- (Endianness) endianness +{ + return LittleEndian; +} + - (unsigned int) readDuration { #ifdef MUSEPACK_API_126 Index: Bundles/OSS/OSS.h =================================================================== RCS file: /sources/gap/gap/user-apps/Cynthiune/Bundles/OSS/OSS.h,v retrieving revision 1.2 diff -u -r1.2 OSS.h --- Bundles/OSS/OSS.h 12 May 2012 22:29:17 -0000 1.2 +++ Bundles/OSS/OSS.h 13 May 2012 08:10:39 -0000 @@ -26,7 +26,7 @@ #define OSS_H #import - +#import #import @class NSFileHandle; Index: Bundles/Ogg/Ogg.m =================================================================== RCS file: /sources/gap/gap/user-apps/Cynthiune/Bundles/Ogg/Ogg.m,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 Ogg.m --- Bundles/Ogg/Ogg.m 25 Mar 2012 07:48:20 -0000 1.1.1.1 +++ Bundles/Ogg/Ogg.m 13 May 2012 08:10:39 -0000 @@ -259,6 +259,11 @@ return (_ov_file->vi->rate); } +- (Endianness) endianness +{ + return LittleEndian; +} + - (unsigned int) readDuration { return (ov_time_total (_ov_file, -1)); Index: Bundles/Timidity/Timidity.m =================================================================== RCS file: /sources/gap/gap/user-apps/Cynthiune/Bundles/Timidity/Timidity.m,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 Timidity.m --- Bundles/Timidity/Timidity.m 25 Mar 2012 07:48:23 -0000 1.1.1.1 +++ Bundles/Timidity/Timidity.m 13 May 2012 08:10:39 -0000 @@ -187,6 +187,11 @@ return size; } +- (Endianness) endianness +{ + return LittleEndian; +} + - (int) lastError { return 0; Index: Bundles/WindowsMedia/CWMFile.cpp =================================================================== RCS file: /sources/gap/gap/user-apps/Cynthiune/Bundles/WindowsMedia/CWMFile.cpp,v retrieving revision 1.2 diff -u -r1.2 CWMFile.cpp --- Bundles/WindowsMedia/CWMFile.cpp 29 Apr 2012 13:40:26 -0000 1.2 +++ Bundles/WindowsMedia/CWMFile.cpp 13 May 2012 08:10:39 -0000 @@ -148,13 +148,12 @@ { size_t _samplesRead, _bytesRead; avm::IReadStream *readStream; - int result, eof; + int result; _samplesRead = 0; _bytesRead = 0; result = 0; - eof = 0; readStream = (avm::IReadStream *) stream; while (!result && !_bytesRead)