Skip to content

Commit

Permalink
Added 3.1.2 layout
Browse files Browse the repository at this point in the history
  • Loading branch information
VoidXH committed Feb 22, 2024
1 parent f6c3d34 commit ef18189
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
8 changes: 6 additions & 2 deletions CavernSamples/CavernizeGUI/Elements/RenderTarget.cs
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,11 @@ public ReferenceChannel[] GetNameMappedChannels() {
/// Default render targets.
/// </summary>
/// <remarks>Top rears are used instead of sides for smooth height transitions and WAVEFORMATEXTENSIBLE support.</remarks>
public static readonly RenderTarget[] Targets = {
public static readonly RenderTarget[] Targets = [
new RenderTarget("3.1.2", [
ReferenceChannel.FrontLeft, ReferenceChannel.FrontRight, ReferenceChannel.FrontCenter, ReferenceChannel.ScreenLFE,
ReferenceChannel.TopFrontLeft, ReferenceChannel.TopFrontRight
]),
new RenderTarget("4.0.4", [
ReferenceChannel.FrontLeft, ReferenceChannel.FrontRight, ReferenceChannel.RearLeft, ReferenceChannel.RearRight,
ReferenceChannel.TopFrontLeft, ReferenceChannel.TopFrontRight, ReferenceChannel.TopRearLeft, ReferenceChannel.TopRearRight
Expand Down Expand Up @@ -155,6 +159,6 @@ public ReferenceChannel[] GetNameMappedChannels() {
new RenderTarget("9.1.6 for WAVE", ChannelPrototype.wav916),
new DriverRenderTarget(),
new VirtualizerRenderTarget()
};
];
}
}
4 changes: 2 additions & 2 deletions CavernSamples/CavernizeGUI/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public MainWindow() {
};

renderTarget.ItemsSource = RenderTarget.Targets;
renderTarget.SelectedIndex = Math.Min(Math.Max(0, Settings.Default.renderTarget + 2), RenderTarget.Targets.Length - 1);
renderTarget.SelectedIndex = Math.Min(Math.Max(0, Settings.Default.renderTarget + 3), RenderTarget.Targets.Length - 1);
renderSettings.IsEnabled = true; // Don't grey out initially
queuedJobs.ItemsSource = jobs;
taskEngine = new(progress, TaskbarItemInfo, status);
Expand Down Expand Up @@ -246,7 +246,7 @@ public void RenderContent(string path) {
protected override void OnClosed(EventArgs e) {
taskEngine?.Dispose();
Settings.Default.ffmpegLocation = ffmpeg.Location;
Settings.Default.renderTarget = renderTarget.SelectedIndex - 2;
Settings.Default.renderTarget = renderTarget.SelectedIndex - 3;
Settings.Default.outputCodec = audio.SelectedIndex;
Settings.Default.force24Bit = force24Bit.IsChecked;
Settings.Default.checkUpdates = checkUpdates.IsChecked;
Expand Down

0 comments on commit ef18189

Please sign in to comment.