From fc3324c8fa6c0aaa37c89d8d0bf098092d705932 Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Sat, 9 Apr 2016 14:46:54 +0100
Subject: WinGui: Use Mixdowns from LibHBand sanitise the choices. The GUI no
 longer shows invalid mixdowns.

---
 win/CS/HandBrakeWPF/Views/AudioView.xaml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'win/CS/HandBrakeWPF/Views')

diff --git a/win/CS/HandBrakeWPF/Views/AudioView.xaml b/win/CS/HandBrakeWPF/Views/AudioView.xaml
index ada1069ac..8620646da 100644
--- a/win/CS/HandBrakeWPF/Views/AudioView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AudioView.xaml
@@ -22,6 +22,8 @@
         <Conveters:BooleanToHiddenVisibilityConverter x:Key="boolToHiddenVisConverter" />
         <Audio:AudioEncoderConverter x:Key="audioEncoderConverter" />
         <Audio:AudioRateTypeConverter x:Key="audioRateTypeConverter" />
+        <Audio:AudioMixdownConverter x:Key="audioMixdownConverter" />
+        <Audio:AudioMixdownListConverter x:Key="audioMixdownListConverter" />
     </UserControl.Resources>
 
     <Grid>
@@ -201,8 +203,9 @@
                             <TextBlock Grid.Row="0" Grid.Column="6" VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.AudioView_Mixdown}"
                                        Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
                             <ComboBox Grid.Row="0" Grid.Column="7" Height="22" Width="120" Margin="5,0,5,0" HorizontalAlignment="Stretch"
-                                      ItemsSource="{Binding DataContext.AudioMixdowns, Converter={StaticResource enumComboConverter}, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
-                                      SelectedItem="{Binding MixDown, Converter={StaticResource enumComboConverter}}"
+                                      ItemsSource="{Binding TrackReference,  Converter={StaticResource audioMixdownListConverter}}"
+                                      SelectedItem="{Binding MixDown, Converter={StaticResource audioMixdownConverter}}"
+                                      DisplayMemberPath="DisplayName"
                                       Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
 
 
-- 
cgit v1.2.3