githubのコードからのfolk
Revision | 6a9962bb730f21e06d182c974dc6e074930a3814 (tree) |
---|---|
Time | 2010-10-04 06:28:29 |
Author | sr55 <sr55@b64f...> |
Commiter | sr55 |
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
@@ -80,10 +80,11 @@ namespace Handbrake.Controls | ||
80 | 80 | string srtLang = String.Empty; |
81 | 81 | string srtDefault = String.Empty; |
82 | 82 | int srtCount = 0; |
83 | + int subCount = 0; | |
83 | 84 | |
84 | 85 | foreach (SubtitleInfo item in subList) |
85 | 86 | { |
86 | - string itemToAdd, trackId; | |
87 | + string itemToAdd; | |
87 | 88 | |
88 | 89 | if (item.IsSrtSubtitle) // We have an SRT file |
89 | 90 | { |
@@ -103,41 +104,30 @@ namespace Handbrake.Controls | ||
103 | 104 | } |
104 | 105 | else // We have Bitmap or CC |
105 | 106 | { |
106 | - string[] tempSub; | |
107 | + subCount++; | |
107 | 108 | |
108 | 109 | // Find --subtitle <string> |
109 | 110 | if (item.Track.Contains("Foreign Audio Search")) |
110 | 111 | itemToAdd = "scan"; |
111 | 112 | else |
112 | 113 | { |
113 | - tempSub = item.Track.Split(' '); | |
114 | + string[] tempSub = item.Track.Split(' '); | |
114 | 115 | itemToAdd = tempSub[0]; |
115 | 116 | } |
116 | 117 | |
117 | 118 | subtitleTracks += subtitleTracks == string.Empty ? itemToAdd : "," + itemToAdd; |
118 | 119 | |
119 | 120 | // Find --subtitle-forced |
120 | - itemToAdd = string.Empty; | |
121 | - tempSub = item.Track.Split(' '); | |
122 | - trackId = tempSub[0]; | |
123 | - | |
124 | 121 | if (item.Forced) |
125 | - itemToAdd = trackId; | |
126 | - | |
127 | - if (itemToAdd != string.Empty) | |
128 | - subtitleForced += subtitleForced == string.Empty ? itemToAdd : "," + itemToAdd; | |
129 | - | |
130 | - // Find --subtitle-burn and --subtitle-default | |
131 | - trackId = tempSub[0]; | |
122 | + subtitleForced += subtitleForced == string.Empty ? subCount.ToString() : "," + subCount; | |
132 | 123 | |
133 | - if (trackId.Trim() == "Foreign") // foreign audio search | |
134 | - trackId = "scan"; | |
124 | + // Find --subtitle-burn | |
125 | + if (item.Burned) | |
126 | + subtitleBurn = subCount.ToString(); | |
135 | 127 | |
136 | - if (item.Burned) // burn | |
137 | - subtitleBurn = trackId; | |
138 | - | |
139 | - if (item.Default) // default | |
140 | - subtitleDefault = trackId; | |
128 | + // Find --subtitle-default | |
129 | + if (item.Default) | |
130 | + subtitleDefault = subCount.ToString(); | |
141 | 131 | } |
142 | 132 | } |
143 | 133 |