Skip to content

Commit

Permalink
Revert "Load the volumes before assigning faders (MightyFlower)"
Browse files Browse the repository at this point in the history
This reverts commit 15b7591.
  • Loading branch information
FrostyCoolSlug committed Sep 16, 2024
1 parent 1dc0638 commit 14f525a
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions daemon/src/device.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3412,20 +3412,6 @@ impl<'a> Device<'a> {
// Set volumes first, applying mute may modify stuff..
debug!("Applying Profile..");

debug!("Setting Channel Volumes..");
let volumes = if let Some(current) = &current {
self.get_load_volume_order(Some(current.volumes))
} else {
self.get_load_volume_order(None)
};

for channel in volumes {
let channel_volume = self.profile.get_channel_volume(channel);

debug!("Setting volume for {} to {}", channel, channel_volume);
self.goxlr.set_volume(channel, channel_volume)?;
}

debug!("Setting Faders..");
let mut mic_assigned_to_fader = false;
//
Expand Down Expand Up @@ -3478,6 +3464,20 @@ impl<'a> Device<'a> {
}
}

debug!("Setting Channel Volumes..");
let volumes = if let Some(current) = &current {
self.get_load_volume_order(Some(current.volumes))
} else {
self.get_load_volume_order(None)
};

for channel in volumes {
let channel_volume = self.profile.get_channel_volume(channel);

debug!("Setting volume for {} to {}", channel, channel_volume);
self.goxlr.set_volume(channel, channel_volume)?;
}

debug!("Applying Submixing Settings..");
self.load_submix_settings(true)?;

Expand Down

0 comments on commit 14f525a

Please sign in to comment.