channel volume setter

Author: sockheadrps

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rpaudio"
-version = "0.0.17"
+version = "0.0.18"
 edition = "2021"
 
 [dependencies]

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "rpaudio"
-version = "0.0.17"
+version = "0.0.18"
 authors = [
   { name="Ryan Skiles", email="r.p.skiles@gmail.com" },
   { name="Beaux44"}

python/effects.pyi

@@ -0,0 +1,32 @@
+# This file is automatically generated by pyo3_stub_gen
+# ruff: noqa: E501, F401
+
+import typing
+from enum import Enum, auto
+
+class ChangeSpeed:
+    duration: typing.Optional[float]
+    start_val: typing.Optional[float]
+    end_val: typing.Optional[float]
+    apply_after: typing.Optional[float]
+    def __new__(cls,duration = ...,start_val = ...,end_val = ...,apply_after = ...): ...
+
+class FadeIn:
+    duration: typing.Optional[float]
+    start_val: typing.Optional[float]
+    end_val: typing.Optional[float]
+    apply_after: typing.Optional[float]
+    def __new__(cls,duration = ...,start_val = ...,end_val = ...,apply_after = ...): ...
+
+class FadeOut:
+    duration: typing.Optional[float]
+    start_val: typing.Optional[float]
+    end_val: typing.Optional[float]
+    apply_after: typing.Optional[float]
+    def __new__(cls,duration = ...,start_val = ...,end_val = ...,apply_after = ...): ...
+
+class ActionType(Enum):
+    FadeIn = auto()
+    FadeOut = auto()
+    ChangeSpeed = auto()
+

python/metadata.pyi

@@ -0,0 +1,28 @@
+# This file is automatically generated by pyo3_stub_gen
+# ruff: noqa: E501, F401
+
+import rpaudio
+import typing
+
+class MetaData:
+    title: typing.Optional[str]
+    artist: typing.Optional[str]
+    date: typing.Optional[str]
+    year: typing.Optional[str]
+    album_title: typing.Optional[str]
+    album_artist: typing.Optional[str]
+    track_number: typing.Optional[str]
+    total_tracks: typing.Optional[str]
+    disc_number: typing.Optional[str]
+    total_discs: typing.Optional[str]
+    genre: typing.Optional[str]
+    composer: typing.Optional[str]
+    comment: typing.Optional[str]
+    sample_rate: typing.Optional[int]
+    channels: typing.Optional[str]
+    duration: typing.Optional[float]
+    def __new__(cls,audio_sink:AudioSink): ...
+    def as_dict(self) -> dict:
+        ...
+
+

python/rpaudio.pyi

@@ -0,0 +1,103 @@
+# This file is automatically generated by pyo3_stub_gen
+# ruff: noqa: E501, F401
+
+import typing
+
+class AudioChannel:
+    auto_consume: bool
+    current_audio: typing.Optional[AudioSink]
+    queue_contents: list[AudioSink]
+    is_playing: bool
+    effects: list
+    def __new__(cls,): ...
+    def push(self, sink:AudioSink) -> None:
+        ...
+
+    def set_auto_consume(self, value:bool) -> None:
+        ...
+
+    def drop_current_audio(self) -> None:
+        ...
+
+    def set_effects_chain(self, effect_list:list) -> None:
+        ...
+
+    def current_audio_data(self) -> typing.Any:
+        ...
+
+
+class AudioSink:
+    metadata: typing.Any
+    metadata_dict: typing.Any
+    is_playing: bool
+    callback: typing.Optional[typing.Any]
+    def __new__(cls,callback = ...): ...
+    def load_audio(self, file_path:str) -> AudioSink:
+        ...
+
+    def play(self) -> None:
+        ...
+
+    def pause(self) -> None:
+        ...
+
+    def stop(self) -> None:
+        ...
+
+    def get_volume(self) -> float:
+        ...
+
+    def set_volume(self, volume:float) -> None:
+        ...
+
+    def get_pos(self) -> float:
+        ...
+
+    def set_duration(self, duration:float) -> None:
+        ...
+
+    def get_remaining_time(self) -> float:
+        ...
+
+    def get_speed(self) -> float:
+        ...
+
+    def set_speed(self, speed:float) -> None:
+        ...
+
+    def try_seek(self, position:float) -> None:
+        ...
+
+    def cancel_callback(self) -> None:
+        ...
+
+    def empty(self) -> bool:
+        ...
+
+    def apply_effects(self, effect_list:list) -> None:
+        ...
+
+    def playback_data(self) -> typing.Any:
+        ...
+
+
+class ChannelManager:
+    def new(self) -> ChannelManager:
+        ...
+
+    def add_channel(self, name:str, channel:AudioChannel) -> None:
+        ...
+
+    def drop_channel(self, name:str) -> None:
+        ...
+
+    def channel(self, name:str) -> typing.Optional[AudioChannel]:
+        ...
+
+    def start_all(self) -> None:
+        ...
+
+    def stop_all(self) -> None:
+        ...
+
+

src/audioqueue.rs

@@ -14,6 +14,7 @@ pub struct AudioChannel {
     pub auto_consume: Arc<Mutex<bool>>,
     currently_playing: Arc<Mutex<Option<AudioSink>>>,
     effects_chain: Arc<Mutex<Vec<ActionType>>>,
+    channel_volume: Arc<Mutex<f32>>,
 }
 
 impl fmt::Debug for AudioSink {
@@ -33,9 +34,17 @@ impl AudioChannel {
 
     pub fn consume(&mut self) {
         if let Some(mut sink) = self.pop() {
+            let volume = self.channel_volume.lock().unwrap();
+            let _ = sink.set_volume(*volume);
             let _ = sink.play();
         }
     }
+
+    pub fn set_volume(&mut self, volume: f32) {
+        if let Ok(mut volume_guard) = self.channel_volume.lock() {
+            *volume_guard = volume;
+        }
+    }
 }
 
 #[pymethods]
@@ -47,6 +56,7 @@ impl AudioChannel {
             auto_consume: Arc::new(Mutex::new(false)),
             currently_playing: Arc::new(Mutex::new(None)),
             effects_chain: Arc::new(Mutex::new(Vec::new())),
+            channel_volume: Arc::new(Mutex::new(1.0)),
         };
 
         let channel_arc = Arc::new(Mutex::new(channel));
@@ -72,6 +82,8 @@ impl AudioChannel {
                 {
                     if playing_guard.is_none() && !queue_guard.is_empty() {
                         let mut next_sink = queue_guard.remove(0);
+                        let volume = channel.channel_volume.lock().unwrap();
+                        let _ = next_sink.set_volume(*volume);
 
                         drop(queue_guard);
 
@@ -137,6 +149,18 @@ impl AudioChannel {
         }
     }
 
+    #[setter]
+    pub fn  channel_volume(&mut self, volume: f32) {
+        if let Ok(mut volume_guard) = self.channel_volume.lock() {
+            *volume_guard = volume;
+            if let Ok(mut currently_playing) = self.currently_playing.lock() {
+                if let Some(ref mut sink) = *currently_playing {
+                    let _ = sink.set_volume(volume);
+                }
+            }
+        }
+    }
+
     #[getter]
     pub fn auto_consume(&self) -> bool {
         if let Ok(auto_consume_guard) = self.auto_consume.lock() {

src/bin/stub_gen.rs

@@ -0,0 +1,8 @@
+use pyo3_stub_gen::Result;
+
+fn main() -> Result<()> {
+    // `stub_info` is a function defined by `define_stub_info_gatherer!` macro.
+    let stub = rpaudio::stub_info()?;
+    stub.generate()?;
+    Ok(())
+}