Skip to content
Permalink
Browse files

- based on feedback changed audio/tone volume (LF) min/max range (45 …

…to -45)

- fixed update Arrangement Identification bug
  • Loading branch information
cozy1 committed Feb 18, 2020
1 parent ef67384 commit 4fe239f958f905a81bf3dc71c1434c5004897bfb

Some generated files are not rendered by default. Learn more.

@@ -1829,10 +1829,10 @@ public DLCPackageData PackageGenerate()
"hanging and the song stats will be reset to zero.";
var result = BetterDialog2.ShowDialog(diaMsg, MESSAGEBOX_CAPTION, "Yes", "No", "Abort", Bitmap.FromHicon(SystemIcons.Hand.Handle), "ReadMe ...", 150, 150);

if (result == DialogResult.Cancel)
if (result == DialogResult.Cancel || result == DialogResult.Abort)
return null;

if (result == DialogResult.OK)
if (result == DialogResult.Yes)
{

updateArrangmentID = true;
@@ -2484,9 +2484,9 @@ private void Volume_MouseEnter(object sender, EventArgs e)
Control control = (Control)sender;
string name = control.Name;
if (name == "numVolSong")
tt.SetToolTip(numVolSong, "Soft 0.0 ... -7.0 (default) ... -30.0 Loud" + Environment.NewLine + "LF (Loudness Factor)");
tt.SetToolTip(numVolSong, "0.0 Soft, -7.0 (Default), -30.0 Loud" + Environment.NewLine + "LF (Loudness Factor)");
else // preview audio volume is normally softer than the main audio
tt.SetToolTip(numVolPreview, "Soft 0.0 ... -5.0 (default) ... -30.0 Loud" + Environment.NewLine + "LF (Loudness Factor)");
tt.SetToolTip(numVolPreview, "0.0 Soft, -5.0 (Default), -30.0 Loud" + Environment.NewLine + "LF (Loudness Factor)");
}

private void btnAlbumArt_Click(object sender, EventArgs e)
@@ -120,6 +120,9 @@
<metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>23, 3</value>
</metadata>
<metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>23, 3</value>
</metadata>
<data name="txtAudioPath.ToolTip" xml:space="preserve">
<value>WARNING: If the toolkit locates
an existing *_preview.* audio file

Some generated files are not rendered by default. Learn more.

@@ -157,7 +157,7 @@ private void Tone_Volume_Tip(object sender, EventArgs f)
tvt.IsBalloon = true;
tvt.InitialDelay = 0;
tvt.ShowAlways = true;
tvt.SetToolTip(volumeBox, "Soft 0.0 ... -20.0 (default) ... -30.0 Loud");
tvt.SetToolTip(volumeBox, "0.0 Soft, -20.0 (Default), -30.0 Loud");
}

private void UpdateToneDescription(ComboBox combo)
@@ -29,5 +29,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.1")]
[assembly: AssemblyInformationalVersion("0b6278e4")]
[assembly: AssemblyConfiguration("2020-02-14T16:26:02")]
[assembly: AssemblyInformationalVersion("ef67384e")]
[assembly: AssemblyConfiguration("2020-02-18T15:58:11")]
@@ -1,6 +1,8 @@
Rocksmith Toolkit Release Notes

- updated RocksmithToolkitLib.SongAppId.xml dlc AppIDs
- based on feedback changed audio/tone volume (LF) min/max range (45 to -45)
- fixed update Arrangement Identification bug
- updated RocksmithToolkitLib.SongAppId.xml dlc AppIds
- improved auto repair of some old toolkit multitone exceptions
- volume ranges settable from 0 to -30 with better defaults
- fixed packer/unpacker PromptComplete now comes to front
@@ -716,8 +716,8 @@ public static DLCPackageData LoadFromFolder(string unpackedDir, Platform targetP
bnkPreviewVolume = bnkWemList.Where(fn => fn.BnkFileName.EndsWith("_preview.bnk")).Select(vf => vf.VolumeFactor).FirstOrDefault();

// validate bnk volumes
var isAudioVolValid = bnkAudioVolume.IsVolumeValid(DEFAULT_AUDIO_VOLUME);
var isPreviewVolValid = bnkPreviewVolume.IsVolumeValid(DEFAULT_PREVIEW_VOLUME);
var isAudioVolValid = bnkAudioVolume.IsVolumeValid();
var isPreviewVolValid = bnkPreviewVolume.IsVolumeValid();

// use default volumes
if (!isAudioVolValid || !isPreviewVolValid)
@@ -296,14 +296,14 @@ public static string GetValidVersion(this string value)
return "";
}

public static bool IsVolumeValid(this float? value, float defaultVolume = -7.0F)
public static bool IsVolumeValid(this float? value)
{
if (value == null)
return false;

// check for valid volume
float volume = (float)Math.Round((double)value, 1);
if (volume > -30.0F && volume < 30.0F)
if (volume >= -45.0F && volume <= 45.0F)
return true;

return false;
@@ -316,7 +316,7 @@ public static float GetValidVolume(this float? value, float defaultVolume = -7.0

// check for valid volume
float volume = (float)Math.Round((double)value, 1);
if (volume >= -30.0F && volume <= 30.0F)
if (volume >= -45.0F && volume <= 45.0F)
return volume;

// use default volume
@@ -29,5 +29,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.1")]
[assembly: AssemblyInformationalVersion("0b6278e4")]
[assembly: AssemblyConfiguration("2020-02-14T16:26:02")]
[assembly: AssemblyInformationalVersion("ef67384e")]
[assembly: AssemblyConfiguration("2020-02-18T15:58:11")]
@@ -29,5 +29,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.1")]
[assembly: AssemblyInformationalVersion("0b6278e4")]
[assembly: AssemblyConfiguration("2020-02-14T16:26:02")]
[assembly: AssemblyInformationalVersion("ef67384e")]
[assembly: AssemblyConfiguration("2020-02-18T15:58:11")]
@@ -1,3 +1,3 @@
2.9.2.1
0b6278e4
2020-02-14T16:26:02
ef67384e
2020-02-18T15:58:11

0 comments on commit 4fe239f

Please sign in to comment.
You can’t perform that action at this time.