diff options
| author | sr55 <[email protected]> | 2013-11-08 19:52:56 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2013-11-08 19:52:56 +0000 |
| commit | d0a2953efbce340e34a971b9481024a51ae52383 (patch) | |
| tree | d1adc4a54026c836e8d0701b758a082121db229d /win | |
| parent | a22ee05bb634b41100bba8df246cd0fc5273b09b (diff) | |
WinGui: Remove AV_MKV option. Now default for the build
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5885 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win')
6 files changed, 8 insertions, 11 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs index 2d1464cf5..9323cc862 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs @@ -24,8 +24,5 @@ namespace HandBrake.ApplicationServices.Model.Encoding [Description("MKV")]
Mkv,
-
- [Description("av_mkv")]
- av_mkv,
}
}
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs b/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs index b3f46f8a1..1c6b785bb 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs @@ -449,7 +449,7 @@ namespace HandBrake.ApplicationServices.Utilities case "m4v":
return OutputFormat.Mp4;
case "mkv":
- return OutputFormat.av_mkv;
+ return OutputFormat.Mkv;
}
}
@@ -470,7 +470,7 @@ namespace HandBrake.ApplicationServices.Utilities return "mp4";
case OutputFormat.Mp4:
return "m4v";
- case OutputFormat.av_mkv:
+ case OutputFormat.Mkv:
return "mkv";
}
}
diff --git a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs index 594f2c912..eecb25890 100644 --- a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs +++ b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs @@ -53,7 +53,7 @@ namespace HandBrakeWPF.Converters.Video List<VideoEncoder> encoders = EnumHelper<VideoEncoder>.GetEnumList().ToList();
EncodeTask task = values[1] as EncodeTask;
- if (task != null && task.OutputFormat != OutputFormat.Mkv && task.OutputFormat != OutputFormat.av_mkv)
+ if (task != null && task.OutputFormat != OutputFormat.Mkv)
{
encoders.Remove(VideoEncoder.Theora);
}
diff --git a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs index f0144d1ec..8c4032466 100644 --- a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs +++ b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs @@ -122,7 +122,7 @@ namespace HandBrakeWPF.Helpers break;
}
}
- else if (task.OutputFormat == OutputFormat.Mkv || task.OutputFormat == OutputFormat.av_mkv)
+ else if (task.OutputFormat == OutputFormat.Mkv)
destinationFilename += ".mkv";
/*
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs index 0a4837719..e4e938be7 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -621,7 +621,7 @@ namespace HandBrakeWPF.ViewModels {
return new List<OutputFormat>
{
- OutputFormat.Mp4, OutputFormat.av_mkv, OutputFormat.Mkv
+ OutputFormat.Mp4, OutputFormat.Mkv
};
}
}
@@ -1407,7 +1407,7 @@ namespace HandBrakeWPF.ViewModels switch (Path.GetExtension(saveFileDialog.FileName))
{
case ".mkv":
- this.SelectedOutputFormat = OutputFormat.av_mkv;
+ this.SelectedOutputFormat = OutputFormat.Mkv;
break;
case ".mp4":
this.SelectedOutputFormat = OutputFormat.Mp4;
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml index fde91bcef..d1add8edf 100644 --- a/win/CS/HandBrakeWPF/Views/MainView.xaml +++ b/win/CS/HandBrakeWPF/Views/MainView.xaml @@ -12,7 +12,7 @@ Micro:Message.Attach="[Event Loaded] = [Action Load]"
SnapsToDevicePixels="True"
UseLayoutRounding="True"
- >
+ >
<i:Interaction.Triggers>
<i:EventTrigger EventName="Drop">
@@ -213,7 +213,7 @@ <Setter Property="ItemsSource" Value="{Binding Children}" />
<Setter Property="InputGestureText" Value="{Binding InputGestureText}" />
<Setter Property="Tag" Value="{Binding}" />
-
+
<Style.Triggers>
<DataTrigger Binding="{Binding Path=IsDrive}" Value="true">
<Setter Property="Icon" Value="{StaticResource Disc}"/>
|