Changeset 497

Show
Ignore:
Timestamp:
02/26/08 19:27:35 (10 months ago)
Author:
gbooker
Message:

Some take 2 updates (can playback now if the importer is removed from the main menu).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/SapphireCompatibilityClasses/SapphireCompatibilityClasses.xcodeproj/project.pbxproj

    r490 r497  
    3939                F580E8740D31288400F2225A /* SapphireButtonControl.h in Headers */ = {isa = PBXBuildFile; fileRef = F580E8720D31288400F2225A /* SapphireButtonControl.h */; settings = {ATTRIBUTES = (Public, ); }; }; 
    4040                F580E8750D31288400F2225A /* SapphireButtonControl.m in Sources */ = {isa = PBXBuildFile; fileRef = F580E8730D31288400F2225A /* SapphireButtonControl.m */; }; 
     41                F585A9DC0D74ED780043AB22 /* BRMusicNowPlayingController.h in Headers */ = {isa = PBXBuildFile; fileRef = F585A9DA0D74ED770043AB22 /* BRMusicNowPlayingController.h */; }; 
     42                F585A9DD0D74ED780043AB22 /* BRMusicNowPlayingController.m in Sources */ = {isa = PBXBuildFile; fileRef = F585A9DB0D74ED780043AB22 /* BRMusicNowPlayingController.m */; }; 
    4143/* End PBXBuildFile section */ 
    4244 
    …… 
    8183                F580E8720D31288400F2225A /* SapphireButtonControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SapphireButtonControl.h; sourceTree = "<group>"; }; 
    8284                F580E8730D31288400F2225A /* SapphireButtonControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SapphireButtonControl.m; sourceTree = "<group>"; }; 
     85                F585A9DA0D74ED770043AB22 /* BRMusicNowPlayingController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BRMusicNowPlayingController.h; sourceTree = "<group>"; }; 
     86                F585A9DB0D74ED780043AB22 /* BRMusicNowPlayingController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BRMusicNowPlayingController.m; sourceTree = "<group>"; }; 
    8387/* End PBXFileReference section */ 
    8488 
    …… 
    152156                                DCA299F20D64A4EF0092E9BB /* BRMetadataPreviewController.h */, 
    153157                                DCA299F30D64A4EF0092E9BB /* BRMetadataPreviewController.m */, 
     158                                F585A9DA0D74ED770043AB22 /* BRMusicNowPlayingController.h */, 
     159                                F585A9DB0D74ED780043AB22 /* BRMusicNowPlayingController.m */, 
    154160                        ); 
    155161                        name = Classes; 
    …… 
    185191                        files = ( 
    186192                                DCA299F40D64A4EF0092E9BB /* BRMetadataPreviewController.h in Headers */, 
     193                                F585A9DC0D74ED780043AB22 /* BRMusicNowPlayingController.h in Headers */, 
    187194                        ); 
    188195                        runOnlyForDeploymentPostprocessing = 0; 
    …… 
    320327                        files = ( 
    321328                                DCA299F50D64A4EF0092E9BB /* BRMetadataPreviewController.m in Sources */, 
     329                                F585A9DD0D74ED780043AB22 /* BRMusicNowPlayingController.m in Sources */, 
    322330                        ); 
    323331                        runOnlyForDeploymentPostprocessing = 0; 

  • trunk/SapphireFrappliance/Sapphire.xcodeproj/project.pbxproj

    r494 r497  
    6565                F56B765E0C3837CE00E934AA /* SapphireShowChooser.m in Sources */ = {isa = PBXBuildFile; fileRef = F56B765D0C3837CE00E934AA /* SapphireShowChooser.m */; }; 
    6666                F56B77D70C3858B400E934AA /* DefaultPreview.png in Resources */ = {isa = PBXBuildFile; fileRef = F56B77D60C3858B400E934AA /* DefaultPreview.png */; }; 
     67                F585A9C80D74EA870043AB22 /* SapphireTakeTwoCompatClasses.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F56895E10D6CE30D00F9D9B0 /* SapphireTakeTwoCompatClasses.framework */; }; 
    6768                F5B418380D0B1EA100BDD361 /* SapphireImportHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = F5B418370D0B1EA100BDD361 /* SapphireImportHelper.m */; }; 
    6869                F5B418650D0B28A200BDD361 /* main_helper.m in Sources */ = {isa = PBXBuildFile; fileRef = F5B418640D0B28A200BDD361 /* main_helper.m */; }; 
    …… 
    127128                        containerPortal = F51BFD2D0D26BDF300E22363 /* SapphireCompatibilityClasses.xcodeproj */; 
    128129                        proxyType = 2; 
    129                         remoteGlobalIDString = DCA299CA0D64A3B30092E9BB /* SapphireTakeTwoCompatClasses.framework */; 
     130                        remoteGlobalIDString = DCA299CA0D64A3B30092E9BB; 
     131                        remoteInfo = SapphireTakeTwoCompatClasses; 
     132                }; 
     133                F585A9C60D74EA810043AB22 /* PBXContainerItemProxy */ = { 
     134                        isa = PBXContainerItemProxy; 
     135                        containerPortal = F51BFD2D0D26BDF300E22363 /* SapphireCompatibilityClasses.xcodeproj */; 
     136                        proxyType = 1; 
     137                        remoteGlobalIDString = DCA299BD0D64A3B30092E9BB /* SapphireTakeTwoCompatClasses */; 
    130138                        remoteInfo = SapphireTakeTwoCompatClasses; 
    131139                }; 
    …… 
    217225                                F5EBE70C0D4A796600042BA0 /* SapphireCompatClasses.framework in CopyFiles */, 
    218226                                F5EBE70D0D4A796600042BA0 /* SapphireLeopardCompatClasses.framework in CopyFiles */, 
     227                                F585A9C80D74EA870043AB22 /* SapphireTakeTwoCompatClasses.framework in CopyFiles */, 
    219228                        ); 
    220229                        runOnlyForDeploymentPostprocessing = 0; 
    …… 
    621630                                F5EBE7070D4A795200042BA0 /* PBXTargetDependency */, 
    622631                                F5EBE7090D4A795200042BA0 /* PBXTargetDependency */, 
     632                                F585A9C70D74EA810043AB22 /* PBXTargetDependency */, 
    623633                        ); 
    624634                        name = Sapphire; 
    …… 
    843853                        targetProxy = F50044110D19A242003FEA08 /* PBXContainerItemProxy */; 
    844854                }; 
     855                F585A9C70D74EA810043AB22 /* PBXTargetDependency */ = { 
     856                        isa = PBXTargetDependency; 
     857                        name = SapphireTakeTwoCompatClasses; 
     858                        targetProxy = F585A9C60D74EA810043AB22 /* PBXContainerItemProxy */; 
     859                }; 
    845860                F5B418710D0B29DE00BDD361 /* PBXTargetDependency */ = { 
    846861                        isa = PBXTargetDependency; 

  • trunk/SapphireFrappliance/SapphireVideoPlayer.m

    r461 r497  
    2020 
    2121#import "SapphireVideoPlayer.h" 
     22#import <SapphireCompatClasses/SapphireFrontRowCompat.h> 
    2223#import <QTKit/QTKit.h> 
    2324#import <objc/objc-class.h> 
    …… 
    5354        Ivar ret = class_getInstanceVariable(myClass, "_movie"); 
    5455         
    55         return *(QTMovie * *)(((char *)self)+ret->ivar_offset); 
     56        if(![SapphireFrontRowCompat usingTakeTwo]) 
     57                return *(QTMovie * *)(((char *)self)+ret->ivar_offset); 
     58        Movie mov = *(Movie *)(((char *)self)+ret->ivar_offset); 
     59        return [QTMovie movieWithQuickTimeMovie:mov disposeWhenDone:NO error:nil]; 
    5660} 
    5761@end