From 405f80c0d12557152a24e579c8ca26e114d1a8b0 Mon Sep 17 00:00:00 2001 From: bjarni Date: Sat, 30 Dec 2006 11:28:26 +0000 Subject: [PATCH] (svn r7639) -Fix: FS#487 Changed music/qtmidi.c to not use functions deprecated by Apple (pvz) --- music/qtmidi.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/music/qtmidi.c b/music/qtmidi.c index 69fc6f6188..6f0a215d0e 100644 --- a/music/qtmidi.c +++ b/music/qtmidi.c @@ -83,16 +83,25 @@ static bool PathToFSSpec(const char *path, FSSpec *spec) */ static void SetMIDITypeIfNeeded(const FSSpec *spec) { - FInfo info; + FSRef ref; + FSCatalogInfo catalogInfo; + assert(spec); - if (noErr != FSpGetFInfo(spec, &info)) return; - - /* Set file type to 'Midi' if the file is _not_ an alias. */ - if (info.fdType != midiType && !(info.fdFlags & kIsAlias)) { - info.fdType = midiType; - FSpSetFInfo(spec, &info); - DEBUG(driver, 3, "qtmidi: changed filetype to 'Midi'"); + if (noErr != FSpMakeFSRef(spec, &ref)) return; + if (noErr != FSGetCatalogInfo(&ref, kFSCatInfoNodeFlags | kFSCatInfoFinderInfo, &catalogInfo, NULL, NULL, NULL)) return; + if (!(catalogInfo.nodeFlags & kFSNodeIsDirectoryMask)) { + FileInfo * const info = (FileInfo *) catalogInfo.finderInfo; + if (info->fileType != midiType && !(info->finderFlags & kIsAlias)) { + OSErr e; + info->fileType = midiType; + e = FSSetCatalogInfo(&ref, kFSCatInfoFinderInfo, &catalogInfo); + if (e == noErr) { + DEBUG(driver, 3, "qtmidi: changed filetype to 'Midi'"); + } else { + DEBUG(driver, 0, "qtmidi: changing filetype to 'Midi' failed - error %d", e); + } + } } }