Changeset 1170 for branches/PlayerFramework/SapphireFrappliance/MetaDataImporting/SapphireVideoTSParser.m

Timestamp:

02/24/2010 06:40:01 PM (2 years ago)

Author:

gbooker

Message:

Corrected some issues with video_ts importing

Files:

• branches/PlayerFramework/SapphireFrappliance/MetaDataImporting/SapphireVideoTSParser.m (modified) (5 diffs)

branches/PlayerFramework/SapphireFrappliance/MetaDataImporting/SapphireVideoTSParser.m

@@ -24 +24 @@
 // Instead of declaring them in the header, we declare them here in a category that extends the class.
 
-@interface SapphireVideoTsParser (InternalMethods)
+@interface SapphireVideoTsParser ()
 
 /*!
@@ -76 +76 @@
 #define vts_VideoIsWidescreen(attrs)                 ( attrs[0] & 0x0c)
 
-#define vts_AudioIsDTS(attrs)                        ((attrs[0] & 0xe0) == 0x0c)
+#define vts_AudioIsDTS(attrs)                        ((attrs[0] & 0xe0) == 0xc0)
 #define vts_AudioIsSurround(attrs)                   ( attrs[0] & 0x02)
 #define vts_AudioIsCommentary(attrs)                 ( attrs[5] >    1)
@@ -100 +100 @@
 static NSString *languageFromEncodedChars( const char firstChar, const char secondChar )
 {
-        static NSLocale *currentLocale = nil;
+        NSLocale *currentLocale = [NSLocale currentLocale];
         const char       langCode[]    = { firstChar, secondChar, 0 };
         
-        if( currentLocale == nil )
-                currentLocale = [NSLocale currentLocale];
-
         return [currentLocale displayNameForKey:NSLocaleLanguageCode
                                                                           value:[NSString stringWithCString:langCode encoding:NSASCIIStringEncoding]];
@@ -319 +316 @@
                 audio = commaSeparatedStringFromCollection( audioList );
         }
-
-        if( audio == nil )
-                audio = BRLocalizedString( @"Not specified", @"No Audio information available for a DVD" );;
 }
 
@@ -355 +349 @@
                 subtitles = commaSeparatedStringFromCollection( subtitleList );
         }
-
-        if( subtitles == nil )
-                subtitles = BRLocalizedString( @"None", @"No Subtitle information available for a DVD" );
 }