mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2025-05-21 06:31:19 +00:00
Merge branch 'rewrite/master' into bugfix/senpai-naughty
This commit is contained in:
commit
270a527602
|
@ -4506,6 +4506,16 @@ class ChartEditorState extends HaxeUIState
|
||||||
function resetConductorAfterTest(_:FlxSubState = null):Void
|
function resetConductorAfterTest(_:FlxSubState = null):Void
|
||||||
{
|
{
|
||||||
moveSongToScrollPosition();
|
moveSongToScrollPosition();
|
||||||
|
|
||||||
|
var instVolumeSlider:Null<Slider> = findComponent('menubarItemVolumeInstrumental', Slider);
|
||||||
|
var vocalVolumeSlider:Null<Slider> = findComponent('menubarItemVolumeVocals', Slider);
|
||||||
|
|
||||||
|
// Reapply the volume.
|
||||||
|
var instTargetVolume:Float = instVolumeSlider?.value ?? 1.0;
|
||||||
|
var vocalTargetVolume:Float = vocalVolumeSlider?.value ?? 1.0;
|
||||||
|
|
||||||
|
if (audioInstTrack != null) audioInstTrack.volume = instTargetVolume;
|
||||||
|
if (audioVocalTrackGroup != null) audioVocalTrackGroup.volume = vocalTargetVolume;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in a new issue