Changeset 1186

Show
Ignore:
Timestamp:
02/26/2010 07:39:43 AM (2 years ago)
Author:
gbooker
Message:

Reverted some changes that didn't need to be in the project and a change that broke things.

Location:
trunk/CommonMediaPlayer/Classes
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/CommonMediaPlayer/Classes/CMPPlayerController.h

    r1184 r1186  
    2222#import "CMPTypesDefines.h" 
    2323 
    24 @protocol CMPInstaller; 
    25  
    26 @protocol CMPInstallerDelegate <NSObject> 
    27  
    28 - (void)installer:(id <CMPInstaller>)installer didEndWithSettings:(NSDictionary *)settings; 
    29  
    30  
    31 @end 
    32  
    33  
    3424@protocol CMPPlayer, CMPPlayerController; 
    3525 
    … …  
    4131@protocol CMPPlayerControllerDelegate <NSObject> 
    4232 
    43 - (void)controller:(id <CMPPlayerController>)controlle:(NSDictionary *)settings; 
     33- (void)controller:(id <CMPPlayerController>)controller didEndWithSettings:(NSDictionary *)settings; 
    4434/*! 
    4535 * Information about the controller; currently no info is defined 
    … …  
    7262@end 
    7363 
    74  
    75  
    76  
    7764#define CMPPlayerAudioSampleRateKey @"sample rate" 
    7865#define CMPPlayerAudioFormatKey @"audio format" 

  • trunk/CommonMediaPlayer/Classes/CMPPlayerManager.h

    r1184 r1186  
    151151        return success; 
    152152} 
    153  
    154  
    155153 
    156154static inline BOOL loadCMPFramework(NSString *frapPath) 
    … …  
    221219                        return NO; 
    222220        } 
    223  
    224          
    225221         
    226222        NSBundle *framework = [NSBundle bundleWithPath:frameworkPath];