2007-11-05 Yavor Doganov Port to FLAC 1.2 (at least a try). * Bundles/FLAC/FLAC.h (Format>): Replace FLAC__FileDecoder with FLAC__StreamDecoder. * Bundles/FLAC/FLAC.m (writeCallback, metadataCallBack) (errorCallback): Likewise. (_initializeFileDecoderWithFilename) : Replace with FLAC__stream_decoder_set_metadata_ignore_all. : Replace with FLAC__stream_decoder_set_metadata_respond. : Deleted, obsolete. Return `FLAC__stream_decoder_init_file'. ([FLAC -streamOpen:fileName]): Replace FLAC__file_decoder_new with FLAC__stream_decoder_new. Likewise for FLAC__file_decoder_delete and FLAC__stream_decoder_delete. ([FLAC -streamClose]): Ditto; do the same with FLAC__file_decoder_process_single and FLAC__stream_decoder_process_single accordingly. ([FLAC -readNextChunk:bufferwithSize:bufferSize]): Replace FLAC__FileDecoderState with StreamDecoderInitStatus. Likewise for FLAC__file_decoder_get_state and FLAC__stream_recorder_get_state. Check for the return values of FLAC__STREAM_DECODER_INIT_STATUS_OK and FLAC__STREAM_DECODER_END_OF_STREAM. ([FLAC -seek:aPos]): Replace FLAC__file_decoder_seek_absolute with FLAC__stream_decoder_seek_absolute. ([FLAC -dealloc]): Replace FLAC__file_decoder_delete with FLAC__stream_decoder_delete. * Bundles/FLACTags/FLACTags.m (writeCallback, metadataCallback) (errorCallback): Replace FLAC__FileDecoder with FLAC__StreamDecoder. ([FLACTags +readTitle:titleartist:artistalbum:albumtrackNumber:trackNumbergenre:genreyear:yearofFilename:filename]): Likewise. Replace FLAC__file_decorder_new with FLAC__stream_decoder_new. : Replace with FLAC__stream_decoder_set_metadata_ignore_all. : Replace with FLAC__stream_decoder_set_metadata_respond. : Deleted, obsolete. [result]: Use FLAC__stream_decoder_init_file with the proper arguments. Changes to build with GNUstep Make 2.0 and GNUstep GUI 0.12. * Frameworks/Cynthiune/NSCellExtensions.m: Include NSCEllExtensions.h first. * Bundles/aRts/GNUmakefile (BUNDLE_INSTALL_DIR): * Bundles/ASFTags/GNUmakefile (BUNDLE_INSTALL_DIR): * Bundles/AudioFile/GNUmakefile (BUNDLE_INSTALL_DIR): * Bundles/Esound/GNUmakefile (BUNDLE_INSTALL_DIR): * Bundles/FLAC/GNUmakefile (BUNDLE_INSTALL_DIR): * Bundles/FLACTags/GNUmakefile (BUNDLE_INSTALL_DIR): * Bundles/ID3Tag/GNUmakefile (BUNDLE_INSTALL_DIR): * Bundles/Mod/GNUmakefile (BUNDLE_INSTALL_DIR): * Bundles/MP3/GNUmakefile (BUNDLE_INSTALL_DIR): * Bundles/Musepack/GNUmakefile (BUNDLE_INSTALL_DIR): * Bundles/Ogg/GNUmakefile (BUNDLE_INSTALL_DIR): * Bundles/OSS/GNUmakefile (BUNDLE_INSTALL_DIR): * Bundles/Taglib/GNUmakefile (BUNDLE_INSTALL_DIR): * Bundles/Timidity/GNUmakefile (BUNDLE_INSTALL_DIR): * Bundles/VorbisTags/GNUmakefile (BUNDLE_INSTALL_DIR): Use $(GNUSTEP_LIBRARY). diff -Nurp /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/aRts/GNUmakefile cynthiune.app-0.9.5/Bundles/aRts/GNUmakefile --- /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/aRts/GNUmakefile 2005-06-24 02:12:29.000000000 +0300 +++ cynthiune.app-0.9.5/Bundles/aRts/GNUmakefile 2007-11-04 23:18:13.000000000 +0200 @@ -35,7 +35,7 @@ include $(GNUSTEP_MAKEFILES)/common.make PACKAGE_NAME=aRts BUNDLE_NAME=aRts BUNDLE_EXTENSION=.output -BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune +BUNDLE_INSTALL_DIR=$(GNUSTEP_LIBRARY)/Cynthiune aRts_PRINCIPAL_CLASS=aRts aRts_LANGUAGES= aRts_LOCALIZED_RESOURCE_FILES= diff -Nurp /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/ASFTags/GNUmakefile cynthiune.app-0.9.5/Bundles/ASFTags/GNUmakefile --- /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/ASFTags/GNUmakefile 2005-09-27 02:19:43.000000000 +0300 +++ cynthiune.app-0.9.5/Bundles/ASFTags/GNUmakefile 2007-11-04 23:16:15.000000000 +0200 @@ -35,7 +35,7 @@ include $(GNUSTEP_MAKEFILES)/common.make PACKAGE_NAME=ASFTags BUNDLE_NAME=ASFTags BUNDLE_EXTENSION=.tags -BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune +BUNDLE_INSTALL_DIR=$(GNUSTEP_LIBRARY)/Cynthiune ASFTags_PRINCIPAL_CLASS=ASFTags # diff -Nurp /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/AudioFile/GNUmakefile cynthiune.app-0.9.5/Bundles/AudioFile/GNUmakefile --- /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/AudioFile/GNUmakefile 2005-04-06 05:20:27.000000000 +0300 +++ cynthiune.app-0.9.5/Bundles/AudioFile/GNUmakefile 2007-11-04 23:11:58.000000000 +0200 @@ -24,7 +24,7 @@ include $(GNUSTEP_MAKEFILES)/common.make PACKAGE_NAME=AudioFile BUNDLE_NAME=AudioFile BUNDLE_EXTENSION=.format -BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune +BUNDLE_INSTALL_DIR=$(GNUSTEP_LIBRARY)/Cynthiune AudioFile_PRINCIPAL_CLASS=AudioFile AudioFile_LIBRARIES_DEPEND_UPON += diff -Nurp /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/Esound/GNUmakefile cynthiune.app-0.9.5/Bundles/Esound/GNUmakefile --- /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/Esound/GNUmakefile 2005-04-06 05:20:27.000000000 +0300 +++ cynthiune.app-0.9.5/Bundles/Esound/GNUmakefile 2007-11-04 23:17:58.000000000 +0200 @@ -35,7 +35,7 @@ include $(GNUSTEP_MAKEFILES)/common.make PACKAGE_NAME=Esound BUNDLE_NAME=Esound BUNDLE_EXTENSION=.output -BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune +BUNDLE_INSTALL_DIR=$(GNUSTEP_LIBRARY)/Cynthiune Esound_PRINCIPAL_CLASS=Esound Esound_LANGUAGES=English French Esound_LOCALIZED_RESOURCE_FILES=Localizable.strings diff -Nurp /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/FLAC/FLAC.h cynthiune.app-0.9.5/Bundles/FLAC/FLAC.h --- /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/FLAC/FLAC.h 2006-03-21 12:11:19.000000000 +0200 +++ cynthiune.app-0.9.5/Bundles/FLAC/FLAC.h 2007-11-05 04:20:51.000000000 +0200 @@ -31,7 +31,7 @@ @interface FLAC : NSObject { - FLAC__FileDecoder *fileDecoder; + FLAC__StreamDecoder *fileDecoder; unsigned int bitsPerSample; unsigned int duration; diff -Nurp /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/FLAC/FLAC.m cynthiune.app-0.9.5/Bundles/FLAC/FLAC.m --- /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/FLAC/FLAC.m 2006-03-21 23:39:13.000000000 +0200 +++ cynthiune.app-0.9.5/Bundles/FLAC/FLAC.m 2007-11-05 03:58:31.000000000 +0200 @@ -39,7 +39,7 @@ #define LOCALIZED(X) _b ([FLAC class], X) static FLAC__StreamDecoderWriteStatus -writeCallback (const FLAC__FileDecoder *fileDecoder, const FLAC__Frame *frame, +writeCallback (const FLAC__StreamDecoder *fileDecoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *clientData) { CFLAC *cStream; @@ -70,7 +70,7 @@ writeCallback (const FLAC__FileDecoder * } static void -metadataCallback (const FLAC__FileDecoder *fileDecoder, +metadataCallback (const FLAC__StreamDecoder *fileDecoder, const FLAC__StreamMetadata *metadata, void *clientData) { @@ -88,7 +88,7 @@ metadataCallback (const FLAC__FileDecode } static void -errorCallback (const FLAC__FileDecoder *fileDecoder, +errorCallback (const FLAC__StreamDecoder *fileDecoder, FLAC__StreamDecoderErrorStatus status, void *clientData) { @@ -161,25 +161,24 @@ errorCallback (const FLAC__FileDecoder * - (BOOL) _initializeFileDecoderWithFilename: (NSString *) fileName { - FLAC__file_decoder_set_metadata_ignore_all (fileDecoder); - FLAC__file_decoder_set_metadata_respond (fileDecoder, + FLAC__stream_decoder_set_metadata_ignore_all (fileDecoder); + FLAC__stream_decoder_set_metadata_respond (fileDecoder, FLAC__METADATA_TYPE_STREAMINFO); - FLAC__file_decoder_set_metadata_callback (fileDecoder, - metadataCallback); - FLAC__file_decoder_set_write_callback (fileDecoder, writeCallback); - FLAC__file_decoder_set_error_callback (fileDecoder, errorCallback); - FLAC__file_decoder_set_client_data (fileDecoder, self); - - return (FLAC__file_decoder_set_filename (fileDecoder, [fileName cString]) - && (FLAC__file_decoder_init (fileDecoder) == FLAC__FILE_DECODER_OK) - && FLAC__file_decoder_process_until_end_of_metadata (fileDecoder)); + return (FLAC__stream_decoder_init_file (fileDecoder, + [fileName cString], + writeCallback, + metadataCallback, + errorCallback, + self) + == FLAC__STREAM_DECODER_INIT_STATUS_OK) + && FLAC__stream_decoder_process_until_end_of_metadata (fileDecoder); } - (BOOL) streamOpen: (NSString *) fileName { BOOL result; - fileDecoder = FLAC__file_decoder_new(); + fileDecoder = FLAC__stream_decoder_new(); if (fileDecoder) { @@ -187,7 +186,7 @@ errorCallback (const FLAC__FileDecoder * result = YES; else { - FLAC__file_decoder_delete (fileDecoder); + FLAC__stream_decoder_delete (fileDecoder); fileDecoder = NULL; result = NO; } @@ -200,7 +199,7 @@ errorCallback (const FLAC__FileDecoder * - (void) streamClose { - FLAC__file_decoder_delete (fileDecoder); + FLAC__stream_decoder_delete (fileDecoder); fileDecoder = NULL; } @@ -215,7 +214,7 @@ errorCallback (const FLAC__FileDecoder * if (position >= readBufferSize) { position = 0; - success = FLAC__file_decoder_process_single (fileDecoder); + success = FLAC__stream_decoder_process_single (fileDecoder); } if (success) @@ -251,13 +250,13 @@ errorCallback (const FLAC__FileDecoder * withSize: (unsigned int) bufferSize { int readBytes; - FLAC__FileDecoderState state; + FLAC__StreamDecoderInitStatus state; - state = FLAC__file_decoder_get_state (fileDecoder); + state = FLAC__stream_decoder_get_state (fileDecoder); - if (state == FLAC__FILE_DECODER_OK) + if (state == FLAC__STREAM_DECODER_INIT_STATUS_OK) readBytes = [self _processNextChunk: buffer withSize: bufferSize]; - else if (state == FLAC__FILE_DECODER_END_OF_FILE) + else if (state == FLAC__STREAM_DECODER_END_OF_STREAM) readBytes = 0; else readBytes = -1; @@ -272,7 +271,7 @@ errorCallback (const FLAC__FileDecoder * - (void) seek: (unsigned int) aPos { - FLAC__file_decoder_seek_absolute (fileDecoder, aPos * rate); + FLAC__stream_decoder_seek_absolute (fileDecoder, aPos * rate); } - (unsigned int) readChannels @@ -295,7 +294,7 @@ errorCallback (const FLAC__FileDecoder * if (readBuffer) free (readBuffer); if (fileDecoder) - FLAC__file_decoder_delete (fileDecoder); + FLAC__stream_decoder_delete (fileDecoder); [super dealloc]; } diff -Nurp /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/FLAC/GNUmakefile cynthiune.app-0.9.5/Bundles/FLAC/GNUmakefile --- /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/FLAC/GNUmakefile 2005-04-06 05:20:27.000000000 +0300 +++ cynthiune.app-0.9.5/Bundles/FLAC/GNUmakefile 2007-11-04 23:12:34.000000000 +0200 @@ -35,7 +35,7 @@ include $(GNUSTEP_MAKEFILES)/common.make PACKAGE_NAME=FLAC BUNDLE_NAME=FLAC BUNDLE_EXTENSION=.format -BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune +BUNDLE_INSTALL_DIR=$(GNUSTEP_LIBRARY)/Cynthiune FLAC_PRINCIPAL_CLASS=FLAC diff -Nurp /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/FLACTags/FLACTags.m cynthiune.app-0.9.5/Bundles/FLACTags/FLACTags.m --- /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/FLACTags/FLACTags.m 2006-03-21 23:41:04.000000000 +0200 +++ cynthiune.app-0.9.5/Bundles/FLACTags/FLACTags.m 2007-11-05 03:24:04.000000000 +0200 @@ -78,14 +78,14 @@ processComment (FLAC__StreamMetadata_Vor } static FLAC__StreamDecoderWriteStatus -writeCallback (const FLAC__FileDecoder *fileDecoder, const FLAC__Frame *frame, +writeCallback (const FLAC__StreamDecoder *fileDecoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *clientData) { return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE; } static void -metadataCallback (const FLAC__FileDecoder *fileDecoder, +metadataCallback (const FLAC__StreamDecoder *fileDecoder, const FLAC__StreamMetadata *metadata, void *clientData) { @@ -104,7 +104,7 @@ metadataCallback (const FLAC__FileDecode } static void -errorCallback (const FLAC__FileDecoder *fileDecoder, +errorCallback (const FLAC__StreamDecoder *fileDecoder, FLAC__StreamDecoderErrorStatus status, void *clientData) { @@ -132,30 +132,25 @@ errorCallback (const FLAC__FileDecoder * year: (NSString **) year ofFilename: (NSString *) filename { - FLAC__FileDecoder *fileDecoder; + FLAC__StreamDecoder *fileDecoder; BOOL result; NSString **arrayOfValues[] = { title, artist, album, trackNumber, genre, year }; - fileDecoder = FLAC__file_decoder_new(); + fileDecoder = FLAC__stream_decoder_new(); if (fileDecoder) { - FLAC__file_decoder_set_metadata_ignore_all (fileDecoder); - FLAC__file_decoder_set_metadata_respond (fileDecoder, + FLAC__stream_decoder_set_metadata_ignore_all (fileDecoder); + FLAC__stream_decoder_set_metadata_respond (fileDecoder, FLAC__METADATA_TYPE_VORBIS_COMMENT); - FLAC__file_decoder_set_metadata_callback (fileDecoder, - metadataCallback); - FLAC__file_decoder_set_write_callback (fileDecoder, writeCallback); - FLAC__file_decoder_set_error_callback (fileDecoder, errorCallback); - FLAC__file_decoder_set_client_data (fileDecoder, arrayOfValues); - - result = (FLAC__file_decoder_set_filename (fileDecoder, - [filename cString]) - && (FLAC__file_decoder_init (fileDecoder) - == FLAC__FILE_DECODER_OK) - && FLAC__file_decoder_process_until_end_of_metadata - (fileDecoder)); - FLAC__file_decoder_delete (fileDecoder); + result = (FLAC__stream_decoder_init_file (fileDecoder, + [filename cString], + writeCallback, metadataCallback, + errorCallback, + *arrayOfValues) + == FLAC__STREAM_DECODER_INIT_STATUS_OK) + && FLAC__stream_decoder_process_until_end_of_metadata (fileDecoder); + FLAC__stream_decoder_delete (fileDecoder); } else result = NO; diff -Nurp /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/FLACTags/GNUmakefile cynthiune.app-0.9.5/Bundles/FLACTags/GNUmakefile --- /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/FLACTags/GNUmakefile 2006-03-21 11:42:12.000000000 +0200 +++ cynthiune.app-0.9.5/Bundles/FLACTags/GNUmakefile 2007-11-04 23:12:51.000000000 +0200 @@ -35,7 +35,7 @@ include $(GNUSTEP_MAKEFILES)/common.make PACKAGE_NAME=FLACTags BUNDLE_NAME=FLACTags BUNDLE_EXTENSION=.tags -BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune +BUNDLE_INSTALL_DIR=$(GNUSTEP_LIBRARY)/Cynthiune FLACTags_PRINCIPAL_CLASS=FLACTags diff -Nurp /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/ID3Tag/GNUmakefile cynthiune.app-0.9.5/Bundles/ID3Tag/GNUmakefile --- /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/ID3Tag/GNUmakefile 2005-09-25 22:13:32.000000000 +0300 +++ cynthiune.app-0.9.5/Bundles/ID3Tag/GNUmakefile 2007-11-04 23:15:04.000000000 +0200 @@ -35,7 +35,7 @@ include $(GNUSTEP_MAKEFILES)/common.make PACKAGE_NAME=ID3Tag BUNDLE_NAME=ID3Tag BUNDLE_EXTENSION=.tags -BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune +BUNDLE_INSTALL_DIR=$(GNUSTEP_LIBRARY)/Cynthiune ID3Tag_PRINCIPAL_CLASS=ID3Tag # diff -Nurp /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/Mod/GNUmakefile cynthiune.app-0.9.5/Bundles/Mod/GNUmakefile --- /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/Mod/GNUmakefile 2005-04-06 05:20:27.000000000 +0300 +++ cynthiune.app-0.9.5/Bundles/Mod/GNUmakefile 2007-11-04 23:13:22.000000000 +0200 @@ -35,7 +35,7 @@ include $(GNUSTEP_MAKEFILES)/common.make PACKAGE_NAME=Mod BUNDLE_NAME=Mod BUNDLE_EXTENSION=.format -BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune +BUNDLE_INSTALL_DIR=$(GNUSTEP_LIBRARY)/Cynthiune Mod_PRINCIPAL_CLASS=Mod diff -Nurp /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/MP3/GNUmakefile cynthiune.app-0.9.5/Bundles/MP3/GNUmakefile --- /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/MP3/GNUmakefile 2005-04-06 05:20:27.000000000 +0300 +++ cynthiune.app-0.9.5/Bundles/MP3/GNUmakefile 2007-11-04 23:10:38.000000000 +0200 @@ -35,7 +35,7 @@ include $(GNUSTEP_MAKEFILES)/common.make PACKAGE_NAME=MP3 BUNDLE_NAME=MP3 BUNDLE_EXTENSION=.format -BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune +BUNDLE_INSTALL_DIR=$(GNUSTEP_LIBRARY)/Cynthiune MP3_PRINCIPAL_CLASS=MP3 # diff -Nurp /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/Musepack/GNUmakefile cynthiune.app-0.9.5/Bundles/Musepack/GNUmakefile --- /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/Musepack/GNUmakefile 2005-05-23 02:08:16.000000000 +0300 +++ cynthiune.app-0.9.5/Bundles/Musepack/GNUmakefile 2007-11-04 23:14:00.000000000 +0200 @@ -28,7 +28,7 @@ include $(GNUSTEP_MAKEFILES)/common.make PACKAGE_NAME=Musepack BUNDLE_NAME=Musepack BUNDLE_EXTENSION=.format -BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune +BUNDLE_INSTALL_DIR=$(GNUSTEP_LIBRARY)/Cynthiune Musepack_PRINCIPAL_CLASS=Musepack # diff -Nurp /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/Ogg/GNUmakefile cynthiune.app-0.9.5/Bundles/Ogg/GNUmakefile --- /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/Ogg/GNUmakefile 2005-04-06 05:20:27.000000000 +0300 +++ cynthiune.app-0.9.5/Bundles/Ogg/GNUmakefile 2007-11-04 23:11:20.000000000 +0200 @@ -35,7 +35,7 @@ include $(GNUSTEP_MAKEFILES)/common.make PACKAGE_NAME=Ogg BUNDLE_NAME=Ogg BUNDLE_EXTENSION=.format -BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune +BUNDLE_INSTALL_DIR=$(GNUSTEP_LIBRARY)/Cynthiune Ogg_PRINCIPAL_CLASS=Ogg diff -Nurp /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/OSS/GNUmakefile cynthiune.app-0.9.5/Bundles/OSS/GNUmakefile --- /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/OSS/GNUmakefile 2005-04-06 05:20:27.000000000 +0300 +++ cynthiune.app-0.9.5/Bundles/OSS/GNUmakefile 2007-11-04 23:17:24.000000000 +0200 @@ -35,7 +35,7 @@ include $(GNUSTEP_MAKEFILES)/common.make PACKAGE_NAME=OSS BUNDLE_NAME=OSS BUNDLE_EXTENSION=.output -BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune +BUNDLE_INSTALL_DIR=$(GNUSTEP_LIBRARY)/Cynthiune OSS_PRINCIPAL_CLASS=OSS OSS_LANGUAGES=English French OSS_LOCALIZED_RESOURCE_FILES=Localizable.strings diff -Nurp /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/Taglib/GNUmakefile cynthiune.app-0.9.5/Bundles/Taglib/GNUmakefile --- /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/Taglib/GNUmakefile 2005-09-26 01:13:40.000000000 +0300 +++ cynthiune.app-0.9.5/Bundles/Taglib/GNUmakefile 2007-11-04 23:15:39.000000000 +0200 @@ -35,7 +35,7 @@ include $(GNUSTEP_MAKEFILES)/common.make PACKAGE_NAME=Taglib BUNDLE_NAME=Taglib BUNDLE_EXTENSION=.tags -BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune +BUNDLE_INSTALL_DIR=$(GNUSTEP_LIBRARY)/Cynthiune Taglib_PRINCIPAL_CLASS=Taglib diff -Nurp /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/Timidity/GNUmakefile cynthiune.app-0.9.5/Bundles/Timidity/GNUmakefile --- /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/Timidity/GNUmakefile 2005-04-06 05:20:27.000000000 +0300 +++ cynthiune.app-0.9.5/Bundles/Timidity/GNUmakefile 2007-11-04 23:14:31.000000000 +0200 @@ -35,7 +35,7 @@ include $(GNUSTEP_MAKEFILES)/common.make PACKAGE_NAME=Timidity BUNDLE_NAME=Timidity BUNDLE_EXTENSION=.format -BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune +BUNDLE_INSTALL_DIR=$(GNUSTEP_LIBRARY)/Cynthiune Timidity_PRINCIPAL_CLASS=Timidity diff -Nurp /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/VorbisTags/GNUmakefile cynthiune.app-0.9.5/Bundles/VorbisTags/GNUmakefile --- /home/yavor/scratch/cynthiune.app-0.9.5/Bundles/VorbisTags/GNUmakefile 2006-02-17 23:17:15.000000000 +0200 +++ cynthiune.app-0.9.5/Bundles/VorbisTags/GNUmakefile 2007-11-04 23:16:49.000000000 +0200 @@ -35,7 +35,7 @@ include $(GNUSTEP_MAKEFILES)/common.make PACKAGE_NAME=VorbisTags BUNDLE_NAME=VorbisTags BUNDLE_EXTENSION=.tags -BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune +BUNDLE_INSTALL_DIR=$(GNUSTEP_LIBRARY)/Cynthiune VorbisTags_PRINCIPAL_CLASS=VorbisTags --- /home/yavor/scratch/cynthiune.app-0.9.5/Frameworks/Cynthiune/NSCellExtensions.m 2006-03-21 08:29:59.000000000 +0200 +++ cynthiune.app-0.9.5/Frameworks/Cynthiune/NSCellExtensions.m 2007-11-05 04:22:53.000000000 +0200 @@ -20,10 +20,10 @@ * Boston, MA 02111-1307, USA. */ -#import - #import "NSCellExtensions.h" +#import + @implementation NSCell (CynthiuneExtensions) - (float) widthOfText: (NSString *) text