summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsr55 <[email protected]>2012-03-01 19:19:23 +0000
committersr55 <[email protected]>2012-03-01 19:19:23 +0000
commit78052b50b43c2cc3dea5690b95ad560a5ef5189f (patch)
treefdb86f58e57154c61c6f8faa5453d431790a1265
parent2efd8f264113bcd3d8c39a1f408c16cc27100aa7 (diff)
WinGui: Another attempt to fix the SampleRate culture bug. Missed a few spots in the last checkin.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4480 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--win/CS/Controls/AudioPanel.cs5
-rw-r--r--win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs3
2 files changed, 5 insertions, 3 deletions
diff --git a/win/CS/Controls/AudioPanel.cs b/win/CS/Controls/AudioPanel.cs
index 2218bcbe9..80d26f46c 100644
--- a/win/CS/Controls/AudioPanel.cs
+++ b/win/CS/Controls/AudioPanel.cs
@@ -12,6 +12,7 @@ namespace Handbrake.Controls
using System.Collections.Specialized;
using System.ComponentModel;
using System.Drawing;
+ using System.Globalization;
using System.Linq;
using System.Windows.Forms;
@@ -366,7 +367,7 @@ namespace Handbrake.Controls
case "drp_audioSample":
double samplerate;
- double.TryParse(drp_audioSample.Text, out samplerate);
+ double.TryParse(drp_audioSample.Text, NumberStyles.Any, CultureInfo.InvariantCulture, out samplerate);
track.SampleRate = samplerate;
break;
case "drp_audioBitrate":
@@ -443,7 +444,7 @@ namespace Handbrake.Controls
double samplerate;
int.TryParse(drp_audioBitrate.Text, out bitrate);
- double.TryParse(drp_audioSample.Text, out samplerate);
+ double.TryParse(drp_audioSample.Text, NumberStyles.Any, CultureInfo.InvariantCulture, out samplerate);
// Create the Model
AudioTrack track = new AudioTrack
diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs
index 4d05591c5..174273e37 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs
@@ -11,6 +11,7 @@ namespace HandBrake.ApplicationServices.Model.Encoding
{
using System;
using System.ComponentModel;
+ using System.Globalization;
using HandBrake.ApplicationServices.Functions;
using HandBrake.ApplicationServices.Parsing;
@@ -260,7 +261,7 @@ namespace HandBrake.ApplicationServices.Model.Encoding
{
get
{
- return this.SampleRate == 0 ? "Auto" : this.SampleRate.ToString();
+ return this.SampleRate == 0 ? "Auto" : this.SampleRate.ToString(CultureInfo.InvariantCulture);
}
}