Show
Ignore:
Timestamp:
02/25/10 17:31:35 (2 years ago)
Author:
gbooker
Message:

Merged changes from the branch back to trunk

Location:
trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/SapphireFrappliance/Browser/SapphireBrowser.m

    r1038 r1179  
    4444#import "SapphireErrorDisplayController.h" 
    4545#import "SapphireAudioNowPlayingController.h" 
     46 
     47 
     48#import "SapphireCMPWrapper.h" 
    4649 
    4750#import <objc/objc-class.h> 
    … …  
    555558        if([currentPlayFile fileContainerTypeValue] == FILE_CONTAINER_TYPE_VIDEO_TS && path != nil) 
    556559        { 
    557                 if([SapphireFrontRowCompat usingLeopard]) 
    558                 { 
    559                         BRDVDMediaAsset *asset = [[BRDVDMediaAsset alloc] initWithPath:path]; 
    560                         SapphireDVDLoadingController *controller = [[SapphireDVDLoadingController alloc] initWithScene:[self scene] forAsset:asset]; 
    561                         [asset release]; 
    562                         [[self stack] pushController:controller]; 
    563                         [controller release]; 
    564                 } 
    565                 else 
    566                 { 
    567                         SapphireErrorDisplayController *controller = [[SapphireErrorDisplayController alloc] initWithScene:[self scene] error:BRLocalizedString(@"Playback Error", @"Short error indicating an error while playing a file") longError:BRLocalizedString(@"DVD Playback is not supported on the AppleTV", @"Error message saying DVD on ATV not supported")]; 
    568                         [[self stack] pushController:controller]; 
    569                         [controller release]; 
    570                 } 
     560                SapphireCMPWrapper *wrapper = [[SapphireCMPWrapper alloc] initWithFile:currentPlayFile scene:[self scene]]; 
     561                id controller = [wrapper controller]; 
     562                [wrapper release]; 
     563//                      SapphireErrorDisplayController *controller = [[SapphireErrorDisplayController alloc] initWithScene:[self scene] error:BRLocalizedString(@"Playback Error", @"Short error indicating an error while playing a file") longError:BRLocalizedString(@"DVD Playback is not supported on the AppleTV", @"Error message saying DVD on ATV not supported")]; 
     564                [[self stack] pushController:controller]; 
    571565        } 
    572566        else if([[NSFileManager defaultManager] acceptFilePath:path] && [currentPlayFile hasVideoValue])