src/cdrom/macosx/CDPlayer.c
changeset 1487 dc6b59e925a2
parent 1402 d910939febfa
child 1662 782fd950bd46
child 1895 c121d94672cb
child 4159 a1b03ba2fcd0
     1.1 --- a/src/cdrom/macosx/CDPlayer.c	Wed Mar 08 18:30:12 2006 +0000
     1.2 +++ b/src/cdrom/macosx/CDPlayer.c	Thu Mar 09 06:33:21 2006 +0000
     1.3 @@ -25,16 +25,16 @@
     1.4  #include "AudioFilePlayer.h"
     1.5  #include "SDLOSXCAGuard.h"
     1.6  
     1.7 -// we're exporting these functions into C land for SDL_syscdrom.c
     1.8 -//extern "C" {
     1.9 +/* we're exporting these functions into C land for SDL_syscdrom.c */
    1.10 +/*extern "C" {*/
    1.11  
    1.12 -//ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ
    1.13 -//  Constants
    1.14 -//ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ
    1.15 +/*///////////////////////////////////////////////////////////////////////////
    1.16 +    Constants
    1.17 +  //////////////////////////////////////////////////////////////////////////*/
    1.18  
    1.19 -#define kAudioCDFilesystemID   (UInt16)(('J' << 8) | 'H') // 'JH'; this avoids compiler warning
    1.20 +#define kAudioCDFilesystemID   (UInt16)(('J' << 8) | 'H') /* 'JH'; this avoids compiler warning */
    1.21  
    1.22 -// XML PList keys
    1.23 +/* XML PList keys */
    1.24  #define kRawTOCDataString           "Format 0x02 TOC Data"
    1.25  #define kSessionsString             "Sessions"
    1.26  #define kSessionTypeString          "Session Type"
    1.27 @@ -47,9 +47,9 @@
    1.28  #define kSessionNumberKeyString         "Session Number"
    1.29  #define kStartBlockKeyString            "Start Block"   
    1.30      
    1.31 -//ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ
    1.32 -//  Globals
    1.33 -//ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ
    1.34 +/*///////////////////////////////////////////////////////////////////////////
    1.35 +    Globals
    1.36 +  //////////////////////////////////////////////////////////////////////////*/
    1.37  
    1.38  #pragma mark -- Globals --
    1.39  
    1.40 @@ -61,9 +61,9 @@
    1.41  static SDL_sem         *callbackSem;
    1.42  static SDL_CD*          theCDROM;
    1.43  
    1.44 -//ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ
    1.45 -//  Prototypes
    1.46 -//ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ
    1.47 +/*///////////////////////////////////////////////////////////////////////////
    1.48 +    Prototypes
    1.49 +  //////////////////////////////////////////////////////////////////////////*/
    1.50  
    1.51  #pragma mark -- Prototypes --
    1.52  
    1.53 @@ -89,10 +89,6 @@
    1.54      SDL_mutexV(apiMutex);
    1.55  }
    1.56  
    1.57 -//ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ
    1.58 -//  DetectAudioCDVolumes
    1.59 -//ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ
    1.60 -
    1.61  int DetectAudioCDVolumes(FSVolumeRefNum *volumes, int numVolumes)
    1.62  {
    1.63      int volumeIndex;
    1.64 @@ -116,7 +112,7 @@
    1.65           
    1.66          if (result == noErr)
    1.67          {
    1.68 -            if (volumeInfo.filesystemID == kAudioCDFilesystemID) // It's an audio CD
    1.69 +            if (volumeInfo.filesystemID == kAudioCDFilesystemID) /* It's an audio CD */
    1.70              {
    1.71                  if (volumes != NULL && cdVolumeCount < numVolumes)
    1.72                      volumes[cdVolumeCount] = actualVolume;
    1.73 @@ -126,18 +122,14 @@
    1.74          }
    1.75          else 
    1.76          {
    1.77 -            // I'm commenting this out because it seems to be harmless
    1.78 -            //SDL_SetError ("DetectAudioCDVolumes: FSGetVolumeInfo returned %d", result);
    1.79 +            /* I'm commenting this out because it seems to be harmless */
    1.80 +            /*SDL_SetError ("DetectAudioCDVolumes: FSGetVolumeInfo returned %d", result);*/
    1.81          }
    1.82      }
    1.83          
    1.84      return cdVolumeCount;
    1.85  }
    1.86  
    1.87 -//ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ
    1.88 -//  ReadTOCData
    1.89 -//ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ
    1.90 -
    1.91  int ReadTOCData (FSVolumeRefNum theVolume, SDL_CD *theCD)
    1.92  {
    1.93      HFSUniStr255      dataForkName;
    1.94 @@ -154,7 +146,7 @@
    1.95      
    1.96      const char* error = "Unspecified Error";
    1.97      
    1.98 -    // get stuff from .TOC.plist                                                   
    1.99 +    /* get stuff from .TOC.plist */
   1.100      fsRefPB.ioCompletion = NULL;
   1.101      fsRefPB.ioNamePtr = "\p.TOC.plist";
   1.102      fsRefPB.ioVRefNum = theVolume;
   1.103 @@ -167,7 +159,7 @@
   1.104          goto bail;
   1.105      }
   1.106      
   1.107 -    // Load and parse the TOC XML data
   1.108 +    /* Load and parse the TOC XML data */
   1.109  
   1.110      theErr = FSGetDataForkName (&dataForkName);
   1.111      if (theErr != noErr) {
   1.112 @@ -187,7 +179,7 @@
   1.113          goto bail;
   1.114      }
   1.115      
   1.116 -    // Allocate some memory for the XML data
   1.117 +    /* Allocate some memory for the XML data */
   1.118      forkData = NewPtr (forkSize);
   1.119      if(forkData == NULL) {
   1.120          error = "NewPtr";
   1.121 @@ -215,9 +207,9 @@
   1.122          goto bail;
   1.123      }
   1.124  
   1.125 -    // Now we got the Property List in memory. Parse it.
   1.126 +    /* Now we got the Property List in memory. Parse it. */
   1.127      
   1.128 -    // First, make sure the root item is a CFDictionary. If not, release and bail.
   1.129 +    /* First, make sure the root item is a CFDictionary. If not, release and bail. */
   1.130      if(CFGetTypeID(propertyListRef)== CFDictionaryGetTypeID())
   1.131      {
   1.132          CFDictionaryRef dictRef = (CFDictionaryRef)propertyListRef;
   1.133 @@ -227,19 +219,19 @@
   1.134          CFIndex     numSessions;
   1.135          CFIndex     index;
   1.136          
   1.137 -        // This is how we get the Raw TOC Data
   1.138 +        /* This is how we get the Raw TOC Data */
   1.139          theRawTOCDataRef = (CFDataRef)CFDictionaryGetValue (dictRef, CFSTR(kRawTOCDataString));
   1.140          
   1.141 -        // Get the session array info.
   1.142 +        /* Get the session array info. */
   1.143          theSessionArrayRef = (CFArrayRef)CFDictionaryGetValue (dictRef, CFSTR(kSessionsString));
   1.144          
   1.145 -        // Find out how many sessions there are.
   1.146 +        /* Find out how many sessions there are. */
   1.147          numSessions = CFArrayGetCount (theSessionArrayRef);
   1.148          
   1.149 -        // Initialize the total number of tracks to 0
   1.150 +        /* Initialize the total number of tracks to 0 */
   1.151          theCD->numtracks = 0;
   1.152          
   1.153 -        // Iterate over all sessions, collecting the track data
   1.154 +        /* Iterate over all sessions, collecting the track data */
   1.155          for(index = 0; index < numSessions; index++)
   1.156          {
   1.157              CFDictionaryRef theSessionDict;
   1.158 @@ -272,7 +264,7 @@
   1.159                  startBlock    = (CFNumberRef)  CFDictionaryGetValue (theTrackDict, CFSTR(kStartBlockKeyString));
   1.160                  isDataTrack   = (CFBooleanRef) CFDictionaryGetValue (theTrackDict, CFSTR(kDataKeyString));
   1.161                                                          
   1.162 -                // Fill in the SDL_CD struct
   1.163 +                /* Fill in the SDL_CD struct */
   1.164                  int idx = theCD->numtracks++;
   1.165  
   1.166                  CFNumberGetValue (trackNumber, kCFNumberSInt32Type, &value);
   1.167 @@ -283,19 +275,19 @@
   1.168  
   1.169                  theCD->track[idx].type = (isDataTrack == kCFBooleanTrue) ? SDL_DATA_TRACK : SDL_AUDIO_TRACK;
   1.170  
   1.171 -                // Since the track lengths are not stored in .TOC.plist we compute them.
   1.172 +                /* Since the track lengths are not stored in .TOC.plist we compute them. */
   1.173                  if (trackIndex > 0) {
   1.174                      theCD->track[idx-1].length = theCD->track[idx].offset - theCD->track[idx-1].offset;
   1.175                  }
   1.176              }
   1.177              
   1.178 -            // Compute the length of the last track
   1.179 +            /* Compute the length of the last track */
   1.180              CFNumberGetValue (leadoutBlock, kCFNumberSInt32Type, &value);
   1.181              
   1.182              theCD->track[theCD->numtracks-1].length = 
   1.183                  value - theCD->track[theCD->numtracks-1].offset;
   1.184  
   1.185 -            // Set offset to leadout track
   1.186 +            /* Set offset to leadout track */
   1.187              theCD->track[theCD->numtracks].offset = value;
   1.188          }
   1.189      
   1.190 @@ -320,10 +312,6 @@
   1.191      return theErr;
   1.192  }
   1.193  
   1.194 -//ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ
   1.195 -//  ListTrackFiles
   1.196 -//ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ
   1.197 -
   1.198  int ListTrackFiles (FSVolumeRefNum theVolume, FSRef *trackFiles, int numTracks)
   1.199  {
   1.200      OSStatus        result = -1;
   1.201 @@ -357,11 +345,11 @@
   1.202                  CFStringRef  name;
   1.203                  name = CFStringCreateWithCharacters (NULL, nameStr.unicode, nameStr.length);
   1.204                  
   1.205 -                // Look for .aiff extension
   1.206 +                /* Look for .aiff extension */
   1.207                  if (CFStringHasSuffix (name, CFSTR(".aiff")) ||
   1.208                      CFStringHasSuffix (name, CFSTR(".cdda"))) {
   1.209                      
   1.210 -                    // Extract the track id from the filename
   1.211 +                    /* Extract the track id from the filename */
   1.212                      int trackID = 0, i = 0;
   1.213                      while (i < nameStr.length && !isdigit(nameStr.unicode[i])) {
   1.214                          ++i;
   1.215 @@ -376,7 +364,7 @@
   1.216                      CFStringGetCStringPtr (name, CFStringGetSystemEncoding()));
   1.217                      #endif
   1.218                      
   1.219 -                    // Track ID's start at 1, but we want to start at 0
   1.220 +                    /* Track ID's start at 1, but we want to start at 0 */
   1.221                      trackID--;
   1.222                      
   1.223                      assert(0 <= trackID && trackID <= SDL_MAX_TRACKS);
   1.224 @@ -393,10 +381,6 @@
   1.225      return 0;
   1.226  }
   1.227  
   1.228 -//ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ
   1.229 -//  LoadFile
   1.230 -//ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ
   1.231 -
   1.232  int LoadFile (const FSRef *ref, int startFrame, int stopFrame)
   1.233  {
   1.234      int error = -1;
   1.235 @@ -404,7 +388,7 @@
   1.236      if (CheckInit () < 0)
   1.237          goto bail;
   1.238      
   1.239 -    // release any currently playing file
   1.240 +    /* release any currently playing file */
   1.241      if (ReleaseFile () < 0)
   1.242          goto bail;
   1.243      
   1.244 @@ -412,14 +396,14 @@
   1.245      printf ("LoadFile: %d %d\n", startFrame, stopFrame);
   1.246      #endif
   1.247      
   1.248 -    //try {
   1.249 +    /*try {*/
   1.250      
   1.251 -        // create a new player, and attach to the audio unit
   1.252 +        /* create a new player, and attach to the audio unit */
   1.253          
   1.254          thePlayer = new_AudioFilePlayer(ref);
   1.255          if (thePlayer == NULL) {
   1.256              SDL_SetError ("LoadFile: Could not create player");
   1.257 -            return -3; //throw (-3);
   1.258 +            return -3; /*throw (-3);*/
   1.259          }
   1.260              
   1.261          if (!thePlayer->SetDestination(thePlayer, &theUnit))
   1.262 @@ -431,8 +415,8 @@
   1.263          if (stopFrame >= 0 && stopFrame > startFrame)
   1.264              thePlayer->SetStopFrame (thePlayer, stopFrame);
   1.265          
   1.266 -        // we set the notifier later
   1.267 -        //thePlayer->SetNotifier(thePlayer, FilePlayNotificationHandler, NULL);
   1.268 +        /* we set the notifier later */
   1.269 +        /*thePlayer->SetNotifier(thePlayer, FilePlayNotificationHandler, NULL);*/
   1.270              
   1.271          if (!thePlayer->Connect(thePlayer))
   1.272              goto bail;
   1.273 @@ -441,11 +425,11 @@
   1.274          thePlayer->Print(thePlayer);
   1.275          fflush (stdout);
   1.276          #endif
   1.277 -    //}
   1.278 -    //catch (...)
   1.279 -    //{
   1.280 -    //    goto bail;
   1.281 -    //}
   1.282 +    /*}
   1.283 +      catch (...)
   1.284 +      {
   1.285 +          goto bail;
   1.286 +      }*/
   1.287          
   1.288      error = 0;
   1.289  
   1.290 @@ -453,16 +437,12 @@
   1.291      return error;
   1.292  }
   1.293  
   1.294 -//ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ
   1.295 -//  ReleaseFile
   1.296 -//ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ
   1.297 -
   1.298  int ReleaseFile ()
   1.299  {
   1.300      int error = -1;
   1.301          
   1.302 -    // (Don't see any way that the original C++ code could throw here.) --ryan.
   1.303 -    //try {
   1.304 +    /* (Don't see any way that the original C++ code could throw here.) --ryan. */
   1.305 +    /*try {*/
   1.306          if (thePlayer != NULL) {
   1.307              
   1.308              thePlayer->Disconnect(thePlayer);
   1.309 @@ -471,22 +451,18 @@
   1.310              
   1.311              thePlayer = NULL;
   1.312          }
   1.313 -    //}
   1.314 -    //catch (...)
   1.315 -    //{
   1.316 -    //    goto bail;
   1.317 -    //}
   1.318 +    /*}
   1.319 +      catch (...)
   1.320 +      {
   1.321 +          goto bail;
   1.322 +      }*/
   1.323      
   1.324      error = 0;
   1.325      
   1.326 -//  bail:
   1.327 +/*  bail: */
   1.328      return error;
   1.329  }
   1.330  
   1.331 -//ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ
   1.332 -//  PlayFile
   1.333 -//ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ
   1.334 -
   1.335  int PlayFile ()
   1.336  {
   1.337      OSStatus result = -1;
   1.338 @@ -494,17 +470,17 @@
   1.339      if (CheckInit () < 0)
   1.340          goto bail;
   1.341          
   1.342 -//    try {
   1.343 +    /*try {*/
   1.344      
   1.345          // start processing of the audio unit
   1.346          result = AudioOutputUnitStart (theUnit);
   1.347              if (result) goto bail; //THROW_RESULT("PlayFile: AudioOutputUnitStart")
   1.348          
   1.349 -//    }
   1.350 -//    catch (...)
   1.351 -//    {
   1.352 -//        goto bail;
   1.353 -//    }
   1.354 +    /*}
   1.355 +    catch (...)
   1.356 +    {
   1.357 +        goto bail;
   1.358 +    }*/
   1.359      
   1.360      result = 0;
   1.361      
   1.362 @@ -512,10 +488,6 @@
   1.363      return result;
   1.364  }
   1.365  
   1.366 -//ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ
   1.367 -//  PauseFile
   1.368 -//ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ
   1.369 -
   1.370  int PauseFile ()
   1.371  {
   1.372      OSStatus result = -1;
   1.373 @@ -523,26 +495,22 @@
   1.374      if (CheckInit () < 0)
   1.375          goto bail;
   1.376              
   1.377 -    //try {
   1.378 +    /*try {*/
   1.379      
   1.380 -        // stop processing the audio unit
   1.381 +        /* stop processing the audio unit */
   1.382          result = AudioOutputUnitStop (theUnit);
   1.383 -            if (result) goto bail;  //THROW_RESULT("PauseFile: AudioOutputUnitStop")
   1.384 -    //}
   1.385 -    //catch (...)
   1.386 -    //{
   1.387 -    //    goto bail;
   1.388 -    //}
   1.389 +            if (result) goto bail;  /*THROW_RESULT("PauseFile: AudioOutputUnitStop")*/
   1.390 +    /*}
   1.391 +      catch (...)
   1.392 +      {
   1.393 +          goto bail;
   1.394 +      }*/
   1.395      
   1.396      result = 0;
   1.397  bail:
   1.398      return result;
   1.399  }
   1.400  
   1.401 -//ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ
   1.402 -//  SetCompletionProc
   1.403 -//ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ
   1.404 -
   1.405  void SetCompletionProc (CDPlayerCompletionProc proc, SDL_CD *cdrom)
   1.406  {
   1.407      assert(thePlayer != NULL);
   1.408 @@ -552,10 +520,6 @@
   1.409      thePlayer->SetNotifier (thePlayer, FilePlayNotificationHandler, cdrom);
   1.410  }
   1.411  
   1.412 -//ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ
   1.413 -//  GetCurrentFrame
   1.414 -//ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ
   1.415 -
   1.416  int GetCurrentFrame ()
   1.417  {    
   1.418      int frame;
   1.419 @@ -578,13 +542,13 @@
   1.420      
   1.421      OSStatus result = noErr;
   1.422      
   1.423 -    // Create the callback semaphore
   1.424 +    /* Create the callback semaphore */
   1.425      callbackSem = SDL_CreateSemaphore(0);
   1.426  
   1.427 -    // Start callback thread
   1.428 +    /* Start callback thread */
   1.429      SDL_CreateThread(RunCallBackThread, NULL);
   1.430  
   1.431 -    { //try {
   1.432 +    { /*try {*/
   1.433          ComponentDescription desc;
   1.434      
   1.435          desc.componentType = kAudioUnitComponentType;
   1.436 @@ -609,10 +573,10 @@
   1.437                      
   1.438          playBackWasInit = true;
   1.439      }
   1.440 -    //catch (...)
   1.441 -    //{
   1.442 -    //    return -1;
   1.443 -    //}
   1.444 +    /*catch (...)
   1.445 +      {
   1.446 +          return -1;
   1.447 +      }*/
   1.448      
   1.449      return 0;
   1.450  }
   1.451 @@ -621,7 +585,7 @@
   1.452  {
   1.453      if (inStatus == kAudioFilePlay_FileIsFinished) {
   1.454      
   1.455 -        // notify non-CA thread to perform the callback
   1.456 +        /* notify non-CA thread to perform the callback */
   1.457          SDL_SemPost(callbackSem);
   1.458          
   1.459      } else if (inStatus == kAudioFilePlayErr_FilePlayUnderrun) {
   1.460 @@ -661,4 +625,4 @@
   1.461      return 0;
   1.462  }
   1.463  
   1.464 -//}; // extern "C"
   1.465 +/*}; // extern "C" */