Skip to content

Commit

Permalink
Added new config controls for mednafen 0.9.42
Browse files Browse the repository at this point in the history
  • Loading branch information
@Asnivor
Asnivor committed Feb 9, 2017
1 parent a70ed5d commit a8d41f8
Show file tree
Hide file tree
Showing 3 changed files with 78 additions and 7 deletions.
64 changes: 59 additions & 5 deletions MedLaunch/MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6566,6 +6566,21 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>

<DockPanel Grid.ColumnSpan="2" Grid.Row="0" VerticalAlignment="Center" Margin="3">
Expand All @@ -6582,14 +6597,53 @@
Name="cfg_snes_faust__resamp_rate_error"/>
</DockPanel>

<Label Name="cfglbl_snes_faust__input__port1" Grid.Column="0" Grid.Row="2">Port 1 Input Device</Label>
<ComboBox x:Name="cfg_snes_faust__input__port1" SelectedValuePath="Tag" Grid.Column="1" Grid.Row="2">
<CheckBox Name="cfg_snes_faust__input__sport1__multitap" Grid.Row="2">Enable multitap on SNES Port 1</CheckBox>
<CheckBox Name="cfg_snes_faust__input__sport2__multitap" Grid.Row="3">Enable multitap on SNES Port 2</CheckBox>

<Label Name="cfglbl_snes_faust__input__port1" Grid.Column="0" Grid.Row="4">Port 1 Input Device</Label>
<ComboBox x:Name="cfg_snes_faust__input__port1" SelectedValuePath="Tag" Grid.Column="1" Grid.Row="4">
<ComboBoxItem Tag="none">None</ComboBoxItem>
<ComboBoxItem Tag="gamepad">Gamepad</ComboBoxItem>
</ComboBox>

<Label Name="cfglbl_snes_faust__input__port2" Grid.Column="0" Grid.Row="5">Port 2 Input Device</Label>
<ComboBox x:Name="cfg_snes_faust__input__port2" SelectedValuePath="Tag" Grid.Column="1" Grid.Row="5">
<ComboBoxItem Tag="none">None</ComboBoxItem>
<ComboBoxItem Tag="gamepad">Gamepad</ComboBoxItem>
</ComboBox>

<Label Name="cfglbl_snes_faust__input__port3" Grid.Column="0" Grid.Row="6">Port 3 Input Device</Label>
<ComboBox x:Name="cfg_snes_faust__input__port3" SelectedValuePath="Tag" Grid.Column="1" Grid.Row="6">
<ComboBoxItem Tag="none">None</ComboBoxItem>
<ComboBoxItem Tag="gamepad">Gamepad</ComboBoxItem>
</ComboBox>

<Label Name="cfglbl_snes_faust__input__port4" Grid.Column="0" Grid.Row="7">Port 4 Input Device</Label>
<ComboBox x:Name="cfg_snes_faust__input__port4" SelectedValuePath="Tag" Grid.Column="1" Grid.Row="7">
<ComboBoxItem Tag="none">None</ComboBoxItem>
<ComboBoxItem Tag="gamepad">Gamepad</ComboBoxItem>
</ComboBox>

<Label Name="cfglbl_snes_faust__input__port5" Grid.Column="0" Grid.Row="8">Port 5 Input Device</Label>
<ComboBox x:Name="cfg_snes_faust__input__port5" SelectedValuePath="Tag" Grid.Column="1" Grid.Row="8">
<ComboBoxItem Tag="none">None</ComboBoxItem>
<ComboBoxItem Tag="gamepad">Gamepad</ComboBoxItem>
</ComboBox>

<Label Name="cfglbl_snes_faust__input__port6" Grid.Column="0" Grid.Row="9">Port 6 Input Device</Label>
<ComboBox x:Name="cfg_snes_faust__input__port6" SelectedValuePath="Tag" Grid.Column="1" Grid.Row="9">
<ComboBoxItem Tag="none">None</ComboBoxItem>
<ComboBoxItem Tag="gamepad">Gamepad</ComboBoxItem>
</ComboBox>

<Label Name="cfglbl_snes_faust__input__port7" Grid.Column="0" Grid.Row="10">Port 7 Input Device</Label>
<ComboBox x:Name="cfg_snes_faust__input__port7" SelectedValuePath="Tag" Grid.Column="1" Grid.Row="10">
<ComboBoxItem Tag="none">None</ComboBoxItem>
<ComboBoxItem Tag="gamepad">Gamepad</ComboBoxItem>
</ComboBox>

<Label Name="cfglbl_snes_faust__input__port2" Grid.Column="0" Grid.Row="3">Port 2 Input Device</Label>
<ComboBox x:Name="cfg_snes_faust__input__port2" SelectedValuePath="Tag" Grid.Column="1" Grid.Row="3">
<Label Name="cfglbl_snes_faust__input__port8" Grid.Column="0" Grid.Row="11">Port 8 Input Device</Label>
<ComboBox x:Name="cfg_snes_faust__input__port8" SelectedValuePath="Tag" Grid.Column="1" Grid.Row="11">
<ComboBoxItem Tag="none">None</ComboBoxItem>
<ComboBoxItem Tag="gamepad">Gamepad</ComboBoxItem>
</ComboBox>
Expand Down Expand Up @@ -9211,7 +9265,7 @@
</TabItem>


<TabItem Header="Controls">
<TabItem Header="Controls" Visibility="{Binding Source={x:Static diag:Debugger.IsAttached}, Converter={StaticResource BoolToVisibilityConverter}}">
<Grid x:Name="grdMednafenControls">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
Expand Down
17 changes: 17 additions & 0 deletions MedLaunch/Models/ConfigBaseSettings.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -689,8 +689,17 @@ public class ConfigBaseSettings
public double? psx__shader__goat__vdiv { get; set; } // -2.00 through 2.00

// SNES (Faust)
public bool snes_faust__input__sport1__multitap { get; set; }
public bool snes_faust__input__sport2__multitap { get; set; }

public string snes_faust__input__port1 { get; set; }
public string snes_faust__input__port2 { get; set; }
public string snes_faust__input__port3 { get; set; }
public string snes_faust__input__port4 { get; set; }
public string snes_faust__input__port5 { get; set; }
public string snes_faust__input__port6 { get; set; }
public string snes_faust__input__port7 { get; set; }
public string snes_faust__input__port8 { get; set; }
public int? snes_faust__resamp_quality { get; set; } // 0 through 5
public double? snes_faust__resamp_rate_error { get; set; } // 0.0000001 through 0.0015
public bool? snes_faust__spex { get; set; }
Expand Down Expand Up @@ -1500,8 +1509,16 @@ public static ConfigBaseSettings GetConfigDefaults()
psx__shader__goat__vdiv = 0.50,

// snes faust
snes_faust__input__sport1__multitap = false,
snes_faust__input__sport2__multitap = false,
snes_faust__input__port1 = "gamepad", // placed
snes_faust__input__port2 = "gamepad", // placed
snes_faust__input__port3 = "gamepad", // placed
snes_faust__input__port4 = "gamepad", // placed
snes_faust__input__port5 = "gamepad", // placed
snes_faust__input__port6 = "gamepad", // placed
snes_faust__input__port7 = "gamepad", // placed
snes_faust__input__port8 = "gamepad", // placed
snes_faust__resamp_quality = 3, // placed
snes_faust__resamp_rate_error = 0.000035, // placed
snes_faust__spex = false, // placed
Expand Down
4 changes: 2 additions & 2 deletions MedLaunch/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.4.0.0")]
[assembly: AssemblyFileVersion("0.4.0.0")]
[assembly: AssemblyVersion("0.4.1.0")]
[assembly: AssemblyFileVersion("0.4.1.0")]

0 comments on commit a8d41f8

Please sign in to comment.