Changeset 529

Timestamp:

05/10/08 13:54:11 (7 months ago)

Author:

gbooker

Message:

Added Video_TS parsing from patch from Warren Gavin
Fixes #165

Files:

• trunk/SapphireFrappliance/Sapphire.xcodeproj/project.pbxproj (modified) (4 diffs)
• trunk/SapphireFrappliance/SapphireMediaPreview.m (modified) (1 diff)
• trunk/SapphireFrappliance/SapphireMetaData.h (modified) (1 diff)
• trunk/SapphireFrappliance/SapphireMetaData.m (modified) (5 diffs)
• trunk/SapphireFrappliance/SapphireVideoTSParser.h (added)
• trunk/SapphireFrappliance/SapphireVideoTSParser.m (added)

trunk/SapphireFrappliance/Sapphire.xcodeproj/project.pbxproj

@@ -69 +69 @@
-                F585A9C80D74EA870043AB22 /* SapphireTakeTwoCompatClasses.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F56895E10D6CE30D00F9D9B0 /* SapphireTakeTwoCompatClasses.framework */; };
-                F59B29D10D9E8C6E002D5DBD /* NSArray-Extensions.m in Sources */ = {isa = PBXBuildFile; fileRef = F5FB82E30D18065F0018E4C9 /* NSArray-Extensions.m */; };
+                F5A262540DD624B900AFB1D6 /* SapphireVideoTSParser.m in Sources */ = {isa = PBXBuildFile; fileRef = F5A262530DD624B900AFB1D6 /* SapphireVideoTSParser.m */; };
-                F5B418380D0B1EA100BDD361 /* SapphireImportHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = F5B418370D0B1EA100BDD361 /* SapphireImportHelper.m */; };
-                F5B418650D0B28A200BDD361 /* main_helper.m in Sources */ = {isa = PBXBuildFile; fileRef = F5B418640D0B28A200BDD361 /* main_helper.m */; };
@@ -285 +286 @@
-                F56B765D0C3837CE00E934AA /* SapphireShowChooser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SapphireShowChooser.m; sourceTree = "<group>"; };
-                F56B77D60C3858B400E934AA /* DefaultPreview.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DefaultPreview.png; sourceTree = "<group>"; };
+                F5A262520DD624B900AFB1D6 /* SapphireVideoTSParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SapphireVideoTSParser.h; sourceTree = "<group>"; };
+                F5A262530DD624B900AFB1D6 /* SapphireVideoTSParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SapphireVideoTSParser.m; sourceTree = "<group>"; };
-                F5B418360D0B1EA100BDD361 /* SapphireImportHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SapphireImportHelper.h; sourceTree = "<group>"; };
-                F5B418370D0B1EA100BDD361 /* SapphireImportHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SapphireImportHelper.m; sourceTree = "<group>"; };
@@ -511 +514 @@
-                                F5B8DEE70C8F85BB00489829 /* SapphireTVDirectory.h */,
-                                F5B8DEE80C8F85BB00489829 /* SapphireTVDirectory.m */,
+                                F5A262520DD624B900AFB1D6 /* SapphireVideoTSParser.h */,
+                                F5A262530DD624B900AFB1D6 /* SapphireVideoTSParser.m */,
-                                F5C078C50CF1033C007C9A16 /* SapphireVirtualDirectory.h */,
-                                F5C078C60CF1033C007C9A16 /* SapphireVirtualDirectory.m */,
@@ -843 +848 @@
-                                F59B29D10D9E8C6E002D5DBD /* NSArray-Extensions.m in Sources */,
-                                F53420560DC2F17F00498822 /* SapphireVideoPlayerController.m in Sources */,
+                                F5A262540DD624B900AFB1D6 /* SapphireVideoTSParser.m in Sources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;

trunk/SapphireFrappliance/SapphireMediaPreview.m

@@ -534 +534 @@
-        /* Show / Hide perian info */
-        if(![[SapphireSettings sharedSettings] displayAudio])
+        {
-                [allMeta removeObjectForKey:AUDIO_DESC_LABEL_KEY];
+                [allMeta removeObjectForKey:SUBTITLE_LABEL_KEY];        
+        }
-        if(![[SapphireSettings sharedSettings] displayVideo])
-                [allMeta removeObjectForKey:VIDEO_DESC_LABEL_KEY];

trunk/SapphireFrappliance/SapphireMetaData.h

@@ -71 +71 @@
-#define AUDIO_DESC_LABEL_KEY                    @"Audio"
-#define VIDEO_DESC_LABEL_KEY                    @"Video"
+#define SUBTITLE_LABEL_KEY                      @"Subtitles"
-
-//Sapphire Virtual Directory Movie Folders

trunk/SapphireFrappliance/SapphireMetaData.m

@@ -28 +28 @@
-#import "SapphireMetaDataScanner.h"
-#import "SapphireImportHelper.h"
+#import "SapphireVideoTSParser.h"
-
-//Structure Specific Keys
@@ -51 +52 @@
-#define VIDEO_DESC_KEY                          @"Video Description"
-#define AUDIO_FORMAT_KEY                        @"Audio Format"
+#define SUBTITLES_KEY                           @"Subtitles"
-#define JOINED_FILE_KEY                         @"Joined File"
-
@@ -1500 +1502 @@
-                VIDEO_DESC_KEY,
-                AUDIO_DESC_KEY,
+                SUBTITLES_KEY,
-                nil];
-        displayedMetaData = [[NSSet alloc] initWithArray:displayedMetaDataOrder];
@@ -1702 +1705 @@
-                        }
-                } //QTMovie
+                else if([file fileContainerType] == FILE_CONTAINER_TYPE_VIDEO_TS)
+                {
+                        SapphireVideoTsParser *dvd = [[SapphireVideoTsParser alloc] initWithPath:path];
+
+                        [fileMeta setObject:[dvd videoFormatsString ] forKey:VIDEO_DESC_KEY];
+                        [fileMeta setObject:[dvd audioFormatsString ] forKey:AUDIO_DESC_KEY];
+                        [fileMeta setObject:[dvd subtitlesString    ] forKey:SUBTITLES_KEY ];
+                        [fileMeta setObject:[dvd mainFeatureDuration] forKey:DURATION_KEY  ];
+
+                        [dvd release];
+                } // VIDEO_TS
-                [file addFileData:fileMeta];
-        }
@@ -1996 +2010 @@
-        if(size == 0)
-                return @"-";
+
-        /*The letter for magnitude*/
-        char letter = ' ';