github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2024-12-18 17:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix playback on track change. Pause/resume is still weird.

Browse source
This commit is contained in:
Sean McNamara 2019-12-25 16:36:30 -05:00
parent ed04c049cc
commit 664c76b201
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
playback/src/audio_backend/gstreamer.rs
View file

@ -25,11 +25,11 @@ impl Open for GstreamerSink {
gst::init().unwrap(); gst::init().unwrap();
let pipelinee = gst::parse_launch(&*pipeline_str).expect("New Pipeline error"); let pipelinee = gst::parse_launch(&*pipeline_str).expect("New Pipeline error");
let pipeline = pipelinee.dynamic_cast::<gst::Pipeline>().expect("Couldnt cast pipeline element at runtime!"); let pipeline = pipelinee.dynamic_cast::<gst::Pipeline>().expect("Couldn't cast pipeline element at runtime!");
let mut bus = pipeline.get_bus().expect("Couldn't get bus from pipeline"); let mut bus = pipeline.get_bus().expect("Couldn't get bus from pipeline");
let mut mainloop = glib::MainLoop::new(None, false); let mut mainloop = glib::MainLoop::new(None, false);
let mut appsrce : gst::Element = pipeline.get_by_name("appsrc0").expect("Couldn't get appsrc from pipeline"); let mut appsrce : gst::Element = pipeline.get_by_name("appsrc0").expect("Couldn't get appsrc from pipeline");
let mut appsrc : gst_app::AppSrc = appsrce.dynamic_cast::<gst_app::AppSrc>().expect("Couldnt cast AppSrc element at runtime!"); let mut appsrc : gst_app::AppSrc = appsrce.dynamic_cast::<gst_app::AppSrc>().expect("Couldn't cast AppSrc element at runtime!");
let bufferpool = gst::BufferPool::new(); let bufferpool = gst::BufferPool::new();
let appsrc_caps = appsrc.get_caps().expect("get appsrc caps failed"); let appsrc_caps = appsrc.get_caps().expect("get appsrc caps failed");
let mut conf = bufferpool.get_config(); let mut conf = bufferpool.get_config();
@ -40,11 +40,14 @@ impl Open for GstreamerSink {
let (tx, rx) = sync_channel::<Vec<u8>>(128); let (tx, rx) = sync_channel::<Vec<u8>>(128);
thread::spawn(move || { thread::spawn(move || {
for data in rx { for data in rx {
let mut buffer = bufferpool.acquire_buffer(None).expect("acquire buffer"); let mut buffer = bufferpool.acquire_buffer(None);
let mutbuf = buffer.make_mut(); if(!buffer.is_err()) {
mutbuf.set_size(data.len()); let mut okbuffer = buffer.unwrap();
mutbuf.copy_from_slice(0, data.as_bytes()); let mutbuf = okbuffer.make_mut();
let res = appsrc.push_buffer(buffer).expect("Failed to push buffer"); mutbuf.set_size(data.len());
mutbuf.copy_from_slice(0, data.as_bytes());
let eat = appsrc.push_buffer(okbuffer);
}
} }
}); });
@ -88,7 +91,7 @@ impl Sink for GstreamerSink {
Ok(()) Ok(())
} }
fn stop(&mut self) -> io::Result<()> { fn stop(&mut self) -> io::Result<()> {
self.pipeline.set_state(gst::State::Paused).expect("Unable to set the pipeline to the `Paused` state"); self.pipeline.set_state(gst::State::Ready).expect("Unable to set the pipeline to the `Ready` state");
Ok(()) Ok(())
} }
fn write(&mut self, data: &[i16]) -> io::Result<()> { fn write(&mut self, data: &[i16]) -> io::Result<()> {