Skip to content

Commit 14f525a

Browse files
Revert "Load the volumes before assigning faders (MightyFlower)"
This reverts commit 15b7591.
1 parent 1dc0638 commit 14f525a

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

daemon/src/device.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3412,20 +3412,6 @@ impl<'a> Device<'a> {
34123412
// Set volumes first, applying mute may modify stuff..
34133413
debug!("Applying Profile..");
34143414

3415-
debug!("Setting Channel Volumes..");
3416-
let volumes = if let Some(current) = &current {
3417-
self.get_load_volume_order(Some(current.volumes))
3418-
} else {
3419-
self.get_load_volume_order(None)
3420-
};
3421-
3422-
for channel in volumes {
3423-
let channel_volume = self.profile.get_channel_volume(channel);
3424-
3425-
debug!("Setting volume for {} to {}", channel, channel_volume);
3426-
self.goxlr.set_volume(channel, channel_volume)?;
3427-
}
3428-
34293415
debug!("Setting Faders..");
34303416
let mut mic_assigned_to_fader = false;
34313417
//
@@ -3478,6 +3464,20 @@ impl<'a> Device<'a> {
34783464
}
34793465
}
34803466

3467+
debug!("Setting Channel Volumes..");
3468+
let volumes = if let Some(current) = &current {
3469+
self.get_load_volume_order(Some(current.volumes))
3470+
} else {
3471+
self.get_load_volume_order(None)
3472+
};
3473+
3474+
for channel in volumes {
3475+
let channel_volume = self.profile.get_channel_volume(channel);
3476+
3477+
debug!("Setting volume for {} to {}", channel, channel_volume);
3478+
self.goxlr.set_volume(channel, channel_volume)?;
3479+
}
3480+
34813481
debug!("Applying Submixing Settings..");
34823482
self.load_submix_settings(true)?;
34833483

0 commit comments

Comments
 (0)