diff options
Diffstat (limited to 'win/C#/Parsing/AudioTrack.cs')
| -rw-r--r-- | win/C#/Parsing/AudioTrack.cs | 70 |
1 files changed, 27 insertions, 43 deletions
diff --git a/win/C#/Parsing/AudioTrack.cs b/win/C#/Parsing/AudioTrack.cs index 493fb4dff..d2d6f3fac 100644 --- a/win/C#/Parsing/AudioTrack.cs +++ b/win/C#/Parsing/AudioTrack.cs @@ -16,76 +16,59 @@ namespace Handbrake.Parsing /// </summary>
public class AudioTrack
{
+ private int m_bitrate;
+ private string m_format;
+ private int m_frequency;
+ private string m_language;
+ private string m_subFormat;
private int m_trackNumber;
+
/// <summary>
/// The track number of this Audio Track
/// </summary>
public int TrackNumber
{
- get
- {
- return this.m_trackNumber;
- }
+ get { return m_trackNumber; }
}
- private string m_language;
/// <summary>
/// The language (if detected) of this Audio Track
/// </summary>
public string Language
{
- get
- {
- return this.m_language;
- }
+ get { return m_language; }
}
- private string m_format;
/// <summary>
/// The primary format of this Audio Track
/// </summary>
public string Format
{
- get
- {
- return this.m_format;
- }
+ get { return m_format; }
}
- private string m_subFormat;
/// <summary>
/// Additional format info for this Audio Track
/// </summary>
public string SubFormat
{
- get
- {
- return this.m_subFormat;
- }
+ get { return m_subFormat; }
}
- private int m_frequency;
/// <summary>
/// The frequency (in MHz) of this Audio Track
/// </summary>
public int Frequency
{
- get
- {
- return this.m_frequency;
- }
+ get { return m_frequency; }
}
- private int m_bitrate;
/// <summary>
/// The bitrate (in kbps) of this Audio Track
/// </summary>
public int Bitrate
{
- get
- {
- return this.m_bitrate;
- }
+ get { return m_bitrate; }
}
/// <summary>
@@ -94,32 +77,33 @@ namespace Handbrake.Parsing /// <returns>A string formatted as: {track #} {language} ({format}) ({sub-format})</returns>
public override string ToString()
{
- if (this.m_subFormat == null)
- return string.Format("{0} {1} ({2})", this.m_trackNumber, this.m_language, this.m_format);
+ if (m_subFormat == null)
+ return string.Format("{0} {1} ({2})", m_trackNumber, m_language, m_format);
else
- return string.Format("{0} {1} ({2}) ({3})", this.m_trackNumber, this.m_language, this.m_format, this.m_subFormat);
+ return string.Format("{0} {1} ({2}) ({3})", m_trackNumber, m_language, m_format, m_subFormat);
}
public static AudioTrack Parse(StringReader output)
{
- String audio_track= output.ReadLine();
- Match m = Regex.Match(audio_track, @"^ \+ ([0-9]*), ([A-Za-z0-9]*) \((.*)\) \((.*)\), ([0-9]*)Hz, ([0-9]*)bps");
+ String audio_track = output.ReadLine();
+ Match m = Regex.Match(audio_track,
+ @"^ \+ ([0-9]*), ([A-Za-z0-9]*) \((.*)\) \((.*)\), ([0-9]*)Hz, ([0-9]*)bps");
Match y = Regex.Match(audio_track, @"^ \+ ([0-9]*), ([A-Za-z0-9]*) \((.*)\)");
if (m.Success)
{
- AudioTrack thisTrack = new AudioTrack();
- thisTrack.m_trackNumber = int.Parse(m.Groups[1].Value.Trim().ToString());
+ var thisTrack = new AudioTrack();
+ thisTrack.m_trackNumber = int.Parse(m.Groups[1].Value.Trim());
thisTrack.m_language = m.Groups[2].Value;
thisTrack.m_format = m.Groups[3].Value;
thisTrack.m_subFormat = m.Groups[4].Value;
- thisTrack.m_frequency = int.Parse(m.Groups[5].Value.Trim().ToString());
- thisTrack.m_bitrate = int.Parse(m.Groups[6].Value.Trim().ToString());
+ thisTrack.m_frequency = int.Parse(m.Groups[5].Value.Trim());
+ thisTrack.m_bitrate = int.Parse(m.Groups[6].Value.Trim());
return thisTrack;
}
else if (y.Success)
{
- AudioTrack thisTrack = new AudioTrack();
- thisTrack.m_trackNumber = int.Parse(y.Groups[1].Value.Trim().ToString());
+ var thisTrack = new AudioTrack();
+ thisTrack.m_trackNumber = int.Parse(y.Groups[1].Value.Trim());
thisTrack.m_language = y.Groups[2].Value;
thisTrack.m_format = y.Groups[3].Value;
return thisTrack;
@@ -130,10 +114,10 @@ namespace Handbrake.Parsing public static AudioTrack[] ParseList(StringReader output)
{
- List<AudioTrack> tracks = new List<AudioTrack>();
+ var tracks = new List<AudioTrack>();
while (true)
{
- AudioTrack thisTrack = AudioTrack.Parse(output);
+ AudioTrack thisTrack = Parse(output);
if (thisTrack != null)
tracks.Add(thisTrack);
else
@@ -142,4 +126,4 @@ namespace Handbrake.Parsing return tracks.ToArray();
}
}
-}
+}
\ No newline at end of file |