409/mixrs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: 409:cdb2cd5144f53745069d7f091de806496765aeae
Branches Tags
409:master 409:dev
..
compare: 409:5b34a72fe464254825ede0dd80e1e27b4def86aa
Branches Tags
409:dev 409:master

4 Commits
cdb2cd5144 ... 5b34a72fe4

Author SHA1 Message Date
409
5b34a72fe4 Merge branch 'dev' 2024-10-06 04:18:57 +02:00
409
25e19ed024 chore: bump version to 0.1.1 2024-10-06 04:17:23 +02:00
409
696ab0a089 fix(instructions): RemoveSinkInput switches selection sometimes 2024-10-06 04:16:19 +02:00
409
c9f4341587 refactor(instructions): UpdateSinkInput use channel and reduce nesting 2024-10-06 04:14:44 +02:00
3 changed files with 48 additions and 53 deletions
Expand all files Collapse all files

2
Cargo.lock generated
View File

@@ -55,7 +55,7 @@ dependencies = [
[[package]] [[package]]
name = "mixrs" name = "mixrs"
version = "0.1.0" version = "0.1.1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"libpulse-binding", "libpulse-binding",

2
Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "mixrs" name = "mixrs"
version = "0.1.0" version = "0.1.1"
edition = "2021" edition = "2021"
[dependencies] [dependencies]

97
src/mixer.rs
View File

@@ -243,68 +243,63 @@ impl Mixer {
} }
} }
} }
PulseInstruction::RemoveSinkInput(sink_index) => { PulseInstruction::RemoveSinkInput(sink_index) => 'remove_sink: {
let selected_index_lock = self.selected_index.lock().unwrap(); let selected_index_lock = self.selected_index.lock().unwrap();
match *selected_index_lock { let Some(selected_index) = *selected_index_lock else {
Some(current_index) => { break 'remove_sink;
drop(selected_index_lock); };
if let Some(removed_sink_input_index) = drop(selected_index_lock);
self.sink_inputs.keys().position(|k| *k == sink_index)
{
let current_key =
*self.sink_inputs.keys().nth(current_index).unwrap();
if self.sink_inputs.remove(&sink_index).is_some() { let Some(removed_sink_input_index) =
if sink_index == current_key self.sink_inputs.keys().position(|k| *k == sink_index)
|| removed_sink_input_index > current_index else {
{ break 'remove_sink;
self.select_previous(); };
}
} let current_key = *self.sink_inputs.keys().nth(selected_index).unwrap();
}
if self.sink_inputs.remove(&sink_index).is_some() {
if sink_index == current_key
|| removed_sink_input_index <= selected_index
{
self.select_previous();
} }
None => (),
} }
} }
PulseInstruction::UpdateSinkInput(sink_index) => { PulseInstruction::UpdateSinkInput(sink_index) => 'update_sink: {
match self.sink_inputs.get_mut(&sink_index) { let Some(sink_input_mixer_data) = self.sink_inputs.get_mut(&sink_index)
Some(sink_input_mixer_data) => { else {
let new_sink_input: Arc<Mutex<Option<SinkInputMixerData>>> = break 'update_sink;
Arc::new(Mutex::new(None)); };
let callback_new_sink_input = new_sink_input.clone();
let operation = self let (new_sink_tx, new_sink_rx) = channel::<Option<SinkInputMixerData>>();
.context let operation = self
.borrow_mut() .context
.introspect() .borrow_mut()
.borrow_mut() .introspect()
.get_sink_input_info(sink_index, move |r| { .borrow_mut()
let ListResult::Item(sink_input) = r else { .get_sink_input_info(sink_index, move |r| {
return; let ListResult::Item(sink_input) = r else {
}; let _ = new_sink_tx.send(None);
return;
};
*callback_new_sink_input.lock().unwrap() = let _ = new_sink_tx.send(Some(SinkInputMixerData {
Some(SinkInputMixerData { name: get_sink_input_name(&sink_input).unwrap(),
name: get_sink_input_name(&sink_input).unwrap(), volume: sink_input.volume.avg().0,
volume: sink_input.volume.avg().0, channels: sink_input.volume.len(),
channels: sink_input.volume.len(), muted: sink_input.mute,
muted: sink_input.mute, }));
}); });
});
while operation.get_state() == pulse::operation::State::Running { while operation.get_state() == pulse::operation::State::Running {
iterate_mainloop(&mut self.mainloop); iterate_mainloop(&mut self.mainloop);
} }
let mut sink_input_lock = new_sink_input.lock().unwrap(); if let Some(new_sink_input) = new_sink_rx.recv().ok().flatten() {
if let Some(new_sink_input) = sink_input_lock.take() { *sink_input_mixer_data = new_sink_input;
*sink_input_mixer_data = new_sink_input;
}
}
None => (),
} }
} }
} }