Changeset 416

Timestamp:

12/20/07 15:53:50 (1 year ago)

Author:

gbooker

Message:

VIDEO_TS support

• Added a file container class (0 is QT movie, 1 is Video_ts, others can be added later)
  
• Directories containing a VIDEO_TS are not remembered as directories, but rather as files
  

Not yet tested on the ATV

Files:

• trunk/Sapphire.xcodeproj/project.pbxproj (modified) (4 diffs)
• trunk/SapphireBrowser.m (modified) (2 diffs)
• trunk/SapphireDVDLoadingController.h (added)
• trunk/SapphireDVDLoadingController.m (added)
• trunk/SapphireMetaData.h (modified) (3 diffs)
• trunk/SapphireMetaData.m (modified) (6 diffs)

trunk/Sapphire.xcodeproj/project.pbxproj

@@ -73 +73 @@
-                F5B418650D0B28A200BDD361 /* main_helper.m in Sources */ = {isa = PBXBuildFile; fileRef = F5B418640D0B28A200BDD361 /* main_helper.m */; };
-                F5B4191B0D0B2CD300BDD361 /* ImportHelper in CopyFiles */ = {isa = PBXBuildFile; fileRef = F5B4185F0D0B288700BDD361 /* ImportHelper */; };
+                F5B54DFA0D1B153200880500 /* SapphireDVDLoadingController.m in Sources */ = {isa = PBXBuildFile; fileRef = F5B54DF40D1B149500880500 /* SapphireDVDLoadingController.m */; };
-                F5B8DEE90C8F85BB00489829 /* SapphireTVDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = F5B8DEE80C8F85BB00489829 /* SapphireTVDirectory.m */; };
-                F5C078C70CF1033C007C9A16 /* SapphireVirtualDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = F5C078C60CF1033C007C9A16 /* SapphireVirtualDirectory.m */; };
@@ -262 +263 @@
-                F5B4185F0D0B288700BDD361 /* ImportHelper */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = ImportHelper; sourceTree = BUILT_PRODUCTS_DIR; };
-                F5B418640D0B28A200BDD361 /* main_helper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main_helper.m; sourceTree = "<group>"; };
+                F5B54DF30D1B149500880500 /* SapphireDVDLoadingController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SapphireDVDLoadingController.h; sourceTree = "<group>"; };
+                F5B54DF40D1B149500880500 /* SapphireDVDLoadingController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SapphireDVDLoadingController.m; sourceTree = "<group>"; };
-                F5B8DEE70C8F85BB00489829 /* SapphireTVDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SapphireTVDirectory.h; sourceTree = "<group>"; };
-                F5B8DEE80C8F85BB00489829 /* SapphireTVDirectory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SapphireTVDirectory.m; sourceTree = "<group>"; };
@@ -477 +480 @@
-                        isa = PBXGroup;
-                        children = (
-657BDC0CD6380C0053869E /* SapphireMediaMenu
-657BDD0CD6380C0053869E /* SapphireMediaMenu
+FD9F140CE27B9C00812CE5 /* BRLayer
+FD9F150CE27B9C00812CE5 /* BRLayer
-                                F5657C430CD66ECA0053869E /* SapphireCenteredMenuController.h */,
-                                F5657C440CD66ECB0053869E /* SapphireCenteredMenuController.m */,
+                                F5B54DF30D1B149500880500 /* SapphireDVDLoadingController.h */,
+                                F5B54DF40D1B149500880500 /* SapphireDVDLoadingController.m */,
+                                F5657D0F0CD6858C0053869E /* SapphireFrontRowCompat.h */,
+                                F5657D100CD6858F0053869E /* SapphireFrontRowCompat.m */,
-                                F54D06930CD690180081D6B1 /* SapphireLayerController.h */,
-                                F54D06940CD690180081D6B1 /* SapphireLayerController.m */,
-                                F5657C520CD66F740053869E /* SapphireMenuController.h */,
-                                F5657C530CD66F750053869E /* SapphireMenuController.m */,
-
-
-
-
+
+
-                                F51F4B160CFC8C8C00BEBAD6 /* SapphireTextWithSpinnerController.h */,
-                                F51F4B170CFC8C8C00BEBAD6 /* SapphireTextWithSpinnerController.m */,
@@ -839 +844 @@
-                                F5B418380D0B1EA100BDD361 /* SapphireImportHelper.m in Sources */,
-                                FE076E410D0CCAA40053FF1A /* NSFileManager-Extensions.m in Sources */,
+                                F5B54DFA0D1B153200880500 /* SapphireDVDLoadingController.m in Sources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;

trunk/SapphireBrowser.m

@@ -33 +33 @@
-#import "SapphireApplianceController.h"
-#import "SapphireFrontRowCompat.h"
+#import "SapphireDVDLoadingController.h"
-
-#import <AudioUnit/AudioUnit.h>
@@ -710 +711 @@
-                CFPreferencesAppSynchronize(A52_DOMIAN);
-                
-
+
+
+
+
+
+
+
+
+
-                {
-                        /*Video*/

trunk/SapphireMetaData.h

@@ -81 +81 @@
-#define META_DATA_FILE_INFO_KIND                @"MetaDataFileInfoKind"
-#define FILE_CLASS_KEY                                  @"File Class"
+#define FILE_CONTAINER_TYPE_KEY                 @"File Container Type"
-typedef enum {
-        FILE_CLASS_NOT_FILE= -1,
@@ -90 +91 @@
-        FILE_CLASS_OTHER = 5,
-} FileClass;
+
+typedef enum {
+        FILE_CONTAINER_TYPE_QT_MOVIE = 0,
+        FILE_CONTAINER_TYPE_VIDEO_TS = 1,
+} FileContainerType;
-
-#define META_DATA_FILE_ADDED_NOTIFICATION                               @"MetaDataFileAdded"
@@ -663 +669 @@
- */
-- (void)setFileClass:(FileClass)fileClass;
+
+/*!
+ * @brief The file container type
+ *
+ * This indicates if the file is a QT movie or other (such as VIDEO_TS)
+ *
+ * @return The file container type
+ */
+- (FileContainerType)fileContainerType;
+
+/*!
+ * @brief Sets the file container type
+ *
+ * This indicates if the file is a QT movie or other (such as VIDEO_TS)
+ *
+ * @param fileContainerType The file container type
+ */
+- (void)setFileContainerType:(FileContainerType)fileContainerType;
+
+
-@end
-

trunk/SapphireMetaData.m

@@ -246 +246 @@
-}
-
+- (BOOL)hasVIDEO_TS:(NSString *)fullPath
+{
+        BOOL isDir = NO;
+        NSFileManager *fm = [NSFileManager defaultManager];
+        if([fm fileExistsAtPath:[fullPath stringByAppendingPathComponent:@"VIDEO_TS"] isDirectory:&isDir] && isDir)
+                return YES;
+        return NO;
+}
+
-- (BOOL)isDirectory:(NSString *)fullPath
-{
-        BOOL isDir = NO;
-
+
+
+
+
+
+
+
+
-}
-
@@ -760 +776 @@
-                                [cachedMetaDirs setObject:resolvedObject forKey:name];
-                }
-
+ || [self hasVIDEO_TS:filePath]
-                {
-                        if(resolvedObject != nil)
@@ -1460 +1476 @@
-                return nil;
-        
+        if([self hasVIDEO_TS:myPath])
+                [self setFileContainerType:FILE_CONTAINER_TYPE_VIDEO_TS];
-        [[NSNotificationCenter defaultCenter] postNotificationName:META_DATA_FILE_ADDED_NOTIFICATION object:self];
-        
@@ -1557 +1575 @@
-                [fileMeta setObject:[NSNumber numberWithInt:META_FILE_VERSION] forKey:META_VERSION_KEY];
-                
-
-
-
-
-
-
-
-
+
-                {
-
-
-
-
+
+
+
+
+
+
+
+
-                        {
-
-
-
-
-
-
-
-
-
+
+
+
+
-                                {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                }
-                                
-                                CFStringRef userText = nil;
-                                propSize = 0;
-                                QTSoundDescriptionGetProperty((SoundDescriptionHandle)sampleDesc, kQTPropertyClass_SoundDescription, kQTSoundDescriptionPropertyID_UserReadableText, sizeof(userText), &userText, &propSize);
-                                if(userText != nil)
-                                {
-                                        /*Set the description*/
-                                        [fileMeta setObject:(NSString *)userText forKey:AUDIO_DESC_KEY];
-                                        CFRelease(userText);
-                                }
-                                DisposeHandle(sampleDesc);
-                        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                                { 
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                } 
- 
-
+
+ //QTMovie
-                [file addFileData:fileMeta];
-        }
@@ -1707 +1728 @@
-- (FileClass)fileClass
-{
-        if([[metaData objectForKey:FILE_CLASS_KEY] intValue]==nil)
-                return FILE_CLASS_UNKNOWN;
-        else
-        return [[metaData objectForKey:FILE_CLASS_KEY] intValue];
-}
@@ -1717 +1735 @@
-        [metaData setObject:[NSNumber numberWithInt:fileClass] forKey:FILE_CLASS_KEY];
-}
+
+- (FileContainerType)fileContainerType
+{
+        return [[metaData objectForKey:FILE_CONTAINER_TYPE_KEY] intValue];
+}
+
+- (void)setFileContainerType:(FileContainerType)fileContainerType
+{
+        [metaData setObject:[NSNumber numberWithInt:fileContainerType] forKey:FILE_CONTAINER_TYPE_KEY];
+}
+
-
-- (NSString *)joinedFile;