Commit: 6a9962bb730f21e06d182c974dc6e074930a3814 - handbrake-jp-git (git)

githubのコードからのfolk

Commit MetaInfo

• Revision: 6a9962bb730f21e06d182c974dc6e074930a3814 (tree)
• Time: 2010-10-04 06:28:29
• Author: sr55 <sr55@b64f...>
• Commiter: sr55

Log Message

WinGui:
- Update the Subtitles panel to handle the previous revision fix to the CLI

git-svn-id: svn://localhost/HandBrake/trunk@3566 b64f7644-9d1e-0410-96f1-a4d463321fa5

Change Summary

• modified: win/C#/Controls/Subtitles.cs

Incremental Difference

--- a/win/C#/Controls/Subtitles.cs
+++ b/win/C#/Controls/Subtitles.cs
@@ -80,10 +80,11 @@ namespace Handbrake.Controls
                     string srtLang = String.Empty;
                     string srtDefault = String.Empty;
                     int srtCount = 0;
+                    int subCount = 0;
 
                     foreach (SubtitleInfo item in subList)
                     {
-                        string itemToAdd, trackId;
+                        string itemToAdd;
 
                         if (item.IsSrtSubtitle) // We have an SRT file
                         {
@@ -103,41 +104,30 @@ namespace Handbrake.Controls
                         }
                         else // We have Bitmap or CC
                         {
-                            string[] tempSub;
+                            subCount++;
 
                             // Find --subtitle <string>
                             if (item.Track.Contains("Foreign Audio Search"))
                                 itemToAdd = "scan";
                             else
                             {
-                                tempSub = item.Track.Split(' ');
+                                string[] tempSub = item.Track.Split(' ');
                                 itemToAdd = tempSub[0];
                             }
 
                             subtitleTracks += subtitleTracks == string.Empty ? itemToAdd : "," + itemToAdd;
 
                             // Find --subtitle-forced
-                            itemToAdd = string.Empty;
-                            tempSub = item.Track.Split(' ');
-                            trackId = tempSub[0];
-
                             if (item.Forced)
-                                itemToAdd = trackId;
-
-                            if (itemToAdd != string.Empty)
-                                subtitleForced += subtitleForced == string.Empty ? itemToAdd : "," + itemToAdd;
-
-                            // Find --subtitle-burn and --subtitle-default
-                            trackId = tempSub[0];
+                                subtitleForced += subtitleForced == string.Empty ? subCount.ToString() : "," + subCount;
 
-                            if (trackId.Trim() == "Foreign") // foreign audio search
-                                trackId = "scan";
+                            // Find --subtitle-burn
+                            if (item.Burned)
+                                subtitleBurn = subCount.ToString();
 
-                            if (item.Burned) // burn
-                                subtitleBurn = trackId;
-
-                            if (item.Default) // default
-                                subtitleDefault = trackId;
+                            // Find --subtitle-default
+                            if (item.Default)
+                                subtitleDefault = subCount.ToString();
                         }
                     }