x264 bump to r1338-19977e9

[handbrake-jp/handbrake-jp-git.git] / macosx / HBSubtitles.m

diff --git a/macosx/HBSubtitles.m b/macosx/HBSubtitles.m
index 3d3b347..95ffad0 100644 (file)
--- a/macosx/HBSubtitles.m
+++ b/macosx/HBSubtitles.m
@@ -290,7 +290,7 @@
                 if (subtitle->format == PICTURESUB)
                 {
                     trackTypeString = @"- (Bitmap)";
-                    isPictureSub = 0;
+                    isPictureSub = 1;
                 }
                 else
                 {
@@ -366,6 +366,7 @@
     [newSubtitleSourceTrack setObject:displayname forKey:@"sourceTrackName"];
     /* Subtitle Source track type (Source, Srt, etc.) */
     [newSubtitleSourceTrack setObject:@"SRT" forKey:@"sourceTrackType"];
+    [newSubtitleSourceTrack setObject:@"SRT" forKey:@"subtitleSourceTrackType"];
     /* Subtitle Source track type */
     [newSubtitleSourceTrack setObject:filePath forKey:@"sourceSrtFilePath"];
     /* Subtitle Source track popup isPictureSub */ 
@@ -390,6 +391,9 @@
     {
         [newSubtitleSrtTrack setObject:[NSNumber numberWithInt:[subtitleSourceArray count]] forKey:@"subtitleSourceTrackNum"];
     }
+    
+    [newSubtitleSrtTrack setObject:@"SRT" forKey:@"sourceTrackType"];
+    [newSubtitleSrtTrack setObject:@"SRT" forKey:@"subtitleSourceTrackType"];
     /* Subtitle Source track popup language */
     [newSubtitleSrtTrack setObject:displayname forKey:@"subtitleSourceTrackName"];
     /* Subtitle Source track popup isPictureSub */
@@ -783,17 +787,7 @@ container = newContainer;
         
         if ([[aTableColumn identifier] isEqualToString:@"forced"])
         {
-            if ([[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackType"] isEqualToString:@"SRT"])
-            {
-            [aCell setState:0];
-            [[subtitleArray objectAtIndex:rowIndex] setObject:0 forKey:@"subtitleTrackForced"];
-            [aCell setEnabled:NO]; 
-            }
-            else
-            {
-            [aCell setEnabled:YES];
             [aCell setState:[[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleTrackForced"] intValue]];
-            }
         }
         else if ([[aTableColumn identifier] isEqualToString:@"burned"])
         {