Improved data stream header handling

Author: GeoffClements

Cargo.lock

@@ -20,7 +20,7 @@ log = "0.4.27"
 notify-rust = { version = "4.11.7", default-features = false, optional = true, features = [
     "dbus",
 ] }
-pulse = { package = "libpulse-binding", version = "2.29.0", optional = true }
+pulse = { package = "libpulse-binding", version = "2.30.1", optional = true }
 rodio = { version = "0.20.1", optional = true, default-features = false, features = [
     "crossbeam-channel",
 ] }

Cargo.toml

@@ -1,5 +1,5 @@
 use std::{
-    io::{BufRead, BufReader, Write},
+    io::{BufRead, Write},
     mem,
     net::{Ipv4Addr, TcpStream},
     sync::{Arc, Mutex},
@@ -372,8 +372,16 @@ pub fn make_decoder(
 
     stream_in.send(PlayerMsg::Connected).ok();
 
-    let mut data_stream = BufReader::new(data_stream);
-    
+    let mut data_stream = SlimBuffer::with_capacity(
+        threshold as usize * 1024,
+        data_stream,
+        status.clone(),
+        threshold,
+        None,
+    );
+
+    stream_in.send(PlayerMsg::BufferThreshold).ok();
+
     // Read until we encounter the end of headers (a blank line: "\r\n\r\n")
     {
         let mut line = String::new();
@@ -387,16 +395,9 @@ pub fn make_decoder(
     }
 
     let mss = MediaSourceStream::new(
-        Box::new(ReadOnlySource::new(SlimBuffer::with_capacity(
-            threshold as usize * 1024,
-            data_stream,
-            status,
-            threshold,
-            None,
-        ))),
+        Box::new(ReadOnlySource::new(data_stream)),
         Default::default(),
     );
-    stream_in.send(PlayerMsg::BufferThreshold).ok();
 
     Ok((
         Decoder::try_new(mss, format, pcmsamplerate, pcmchannels)?,

src/decode.rs

@@ -32,6 +32,10 @@ pub fn run(
         // update server details when a Serv message is received
         'outer: loop {
             let mut caps = Capabilities::default();
+
+            let version = env!("CARGO_PKG_VERSION");
+            caps.add_name(version);
+
             caps.add(Capability::Maxsamplerate(192000));
             if syncgroupid.len() > 0 {
                 info!("Joining sync group: {syncgroupid}");