Skip to content

Commit 1c08651

Browse files
author
RandomEngy
committed
Update version numbers, remove some old back compat code.
1 parent 5dccdd2 commit 1c08651

6 files changed

Lines changed: 11 additions & 34 deletions

File tree

Installer/VidCoder-x64.iss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
[Setup]
55
AppName=VidCoder
6-
AppVerName=VidCoder 1.0.1 (x64)
6+
AppVerName=VidCoder 1.0.2 (x64)
77

88
DefaultDirName={pf}\VidCoder
99
DisableProgramGroupPage=yes
@@ -13,7 +13,7 @@ Compression=lzma
1313
SolidCompression=yes
1414

1515
OutputDir=BuiltInstallers
16-
OutputBaseFilename=VidCoder-1.0.1-x64
16+
OutputBaseFilename=VidCoder-1.0.2-x64
1717

1818
AppId=VidCoder-x64
1919
UsePreviousAppDir=yes

Installer/VidCoder-x86.iss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
[Setup]
55
AppName=VidCoder
6-
AppVerName=VidCoder 1.0.1 (x86)
6+
AppVerName=VidCoder 1.0.2 (x86)
77

88
DefaultDirName={pf}\VidCoder
99
DisableProgramGroupPage=yes
@@ -13,7 +13,7 @@ Compression=lzma
1313
SolidCompression=yes
1414

1515
OutputDir=BuiltInstallers
16-
OutputBaseFilename=VidCoder-1.0.1-x86
16+
OutputBaseFilename=VidCoder-1.0.2-x86
1717

1818
AppId=VidCoder
1919
UsePreviousAppDir=yes

VidCoder/Controls/NumberBox.xaml.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ public partial class NumberBox : UserControl
1616

1717
private string noneCaption;
1818

19-
private bool haveFocus = false;
20-
2119
public NumberBox()
2220
{
2321
this.noneCaption = "(none)";
@@ -127,8 +125,6 @@ private double Increment
127125

128126
private void numberBox_GotFocus(object sender, RoutedEventArgs e)
129127
{
130-
this.haveFocus = true;
131-
132128
if (this.AllowEmpty)
133129
{
134130
if (this.Number == 0)
@@ -224,8 +220,6 @@ private void DecrementNumber()
224220

225221
private void NumberBoxLostFocus(object sender, RoutedEventArgs e)
226222
{
227-
this.haveFocus = false;
228-
229223
if (this.AllowEmpty && this.numberBox.Text == string.Empty)
230224
{
231225
this.Number = 0;

VidCoder/Model/Presets.cs

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,8 @@ public static Preset LoadPresetFile(string presetFile)
131131
var preset = presetSerializer.Deserialize(reader) as Preset;
132132
if (version < CurrentPresetVersion)
133133
{
134-
UpgradePreset(preset);
134+
// Remove the preset if it hasn't been upgraded by now.
135+
return null;
135136
}
136137

137138
return preset;
@@ -202,27 +203,6 @@ public static bool SavePresetToFile(Preset preset, string filePath)
202203
return false;
203204
}
204205

205-
private static void UpgradePreset(Preset preset)
206-
{
207-
foreach (AudioEncoding audioEncoding in preset.EncodingProfile.AudioEncodings)
208-
{
209-
if (!string.IsNullOrEmpty(audioEncoding.SampleRate))
210-
{
211-
double sampleRate = double.Parse(audioEncoding.SampleRate);
212-
audioEncoding.SampleRateRaw = (int)(sampleRate * 1000);
213-
audioEncoding.SampleRate = null;
214-
}
215-
216-
if (preset.EncodingProfile.OutputFormat == OutputFormat.Mkv)
217-
{
218-
if (audioEncoding.Encoder == AudioEncoder.Ac3Passthrough)
219-
{
220-
audioEncoding.Encoder = AudioEncoder.Passthrough;
221-
}
222-
}
223-
}
224-
}
225-
226206
/// <summary>
227207
/// Saves the given preset data.
228208
/// </summary>

VidCoder/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("1.0.1.0")]
55-
[assembly: AssemblyFileVersion("1.0.1.0")]
54+
[assembly: AssemblyVersion("1.0.2.0")]
55+
[assembly: AssemblyFileVersion("1.0.2.0")]

VidCoder/View/RestoreWindowCommand.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ public bool CanExecute(object parameter)
2727
return true;
2828
}
2929

30+
// We need this to implement ICommand but don't use it.
31+
#pragma warning disable 67
3032
public event EventHandler CanExecuteChanged;
33+
#pragma warning restore 67
3134
}
3235
}

0 commit comments

Comments
 (0)