diff options
| author | sr55 <[email protected]> | 2008-06-12 17:54:15 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2008-06-12 17:54:15 +0000 |
| commit | 3c3dd120dc58da16f237887f29d1251489a1af92 (patch) | |
| tree | 293c0714e4807984e78a152f80dd786b8ad4818f /win/C#/Functions | |
| parent | 01d77f0e0f6a196de290110a14b965588cdc75e2 (diff) | |
WinGui:
- Setup Auto for Audio Sample Rate. (Passes 0 to CLI when set to Auto.)
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1510 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/C#/Functions')
| -rw-r--r-- | win/C#/Functions/Common.cs | 14 | ||||
| -rw-r--r-- | win/C#/Functions/QueryParser.cs | 13 | ||||
| -rw-r--r-- | win/C#/Functions/RssReader.cs | 1 |
3 files changed, 20 insertions, 8 deletions
diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs index 61bd8e5a1..0e772cfb3 100644 --- a/win/C#/Functions/Common.cs +++ b/win/C#/Functions/Common.cs @@ -855,14 +855,14 @@ namespace Handbrake.Functions //Audio Sample Rate - audioSampleRate
if (audioSampleRate1 != "")
- audioSampleRate = " -R " + audioSampleRate1;
+ audioSampleRate = " -R " + audioSampleRate1.Replace("Auto", "0");
if (audioSampleRate2 != "")
{
if (audioSampleRate == "")
- audioSampleRate = " -R 48," + audioSampleRate2;
+ audioSampleRate = " -R 0," + audioSampleRate2.Replace("Auto", "0");
else
- audioSampleRate = audioSampleRate + "," + audioSampleRate2;
+ audioSampleRate = audioSampleRate + "," + audioSampleRate2.Replace("Auto", "0");
}
else
{
@@ -872,21 +872,21 @@ namespace Handbrake.Functions if ((track2 != "") && (track2 != "None"))
{
if (audioSampleRate == "")
- audioSampleRate = " -R 48,48";
+ audioSampleRate = " -R 0,0";
else
- audioSampleRate = audioSampleRate + ",48";
+ audioSampleRate = audioSampleRate + ",0";
}
}
if (audioSampleRate3 != "")
{
- audioSampleRate = audioSampleRate + "," + audioSampleRate3;
+ audioSampleRate = audioSampleRate + "," + audioSampleRate3.Replace("Auto", "0");
}
if (audioSampleRate4 != "")
{
- audioSampleRate = audioSampleRate + "," + audioSampleRate4;
+ audioSampleRate = audioSampleRate + "," + audioSampleRate4.Replace("Auto", "0");
}
//
diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs index 87c1def3e..ae5d39cb9 100644 --- a/win/C#/Functions/QueryParser.cs +++ b/win/C#/Functions/QueryParser.cs @@ -1133,24 +1133,37 @@ namespace Handbrake.Functions // Audio Sample Rate
+ // Make sure to change 0 to Auto
if (audioSampleRate1.Success != false)
+ {
thisQuery.q_audioSamplerate1 = audioSampleRate1.ToString().Replace("-R ", "").Trim();
+ if (thisQuery.q_audioSamplerate1 == "0")
+ thisQuery.q_audioSamplerate1 = "Auto";
+ }
+ else
+ thisQuery.q_audioSamplerate1 = "Auto";
if (audioSampleRate2.Success != false)
{
string[] audioSRSelect = audioSampleRate2.ToString().Split(',');
+ if (audioSRSelect[1] == "0")
+ audioSRSelect[1] = "Auto";
thisQuery.q_audioSamplerate2 = audioSRSelect[1].Trim();
}
if (audioSampleRate3.Success != false)
{
string[] audioSRSelect = audioSampleRate3.ToString().Split(',');
+ if (audioSRSelect[1] == "0")
+ audioSRSelect[1] = "Auto";
thisQuery.q_audioSamplerate3 = audioSRSelect[2].Trim();
}
if (audioSampleRate4.Success != false)
{
string[] audioSRSelect = audioSampleRate4.ToString().Split(',');
+ if (audioSRSelect[1] == "0")
+ audioSRSelect[1] = "Auto";
thisQuery.q_audioSamplerate4 = audioSRSelect[3].Trim();
}
diff --git a/win/C#/Functions/RssReader.cs b/win/C#/Functions/RssReader.cs index ec461a402..bf9a1f5ca 100644 --- a/win/C#/Functions/RssReader.cs +++ b/win/C#/Functions/RssReader.cs @@ -24,7 +24,6 @@ namespace Handbrake.Functions XmlNode nodeRss;
XmlNode nodeChannel;
XmlNode nodeItem;
- string t;
private void readRss()
{
|