+7 -2

crates/graphql/src/schema/playlist.rs

reviewed

··· 47 47 Ok("playlist resume".to_string()) 48 48 } 49 49 50 50 - async fn resume_track(&self) -> String { 51 51 - "resume track".to_string() 50 50 + async fn resume_track(&self, ctx: &Context<'_>) -> Result<String, Error> { 51 51 + ctx.data::<Arc<Mutex<Sender<RockboxCommand>>>>() 52 52 + .unwrap() 53 53 + .lock() 54 54 + .unwrap() 55 55 + .send(RockboxCommand::PlaylistResumeTrack)?; 56 56 + Ok("resume track".to_string()) 52 57 } 53 58 54 59 async fn playlist_set_modified(&self) -> String {

+4

crates/rpc/proto/rockbox/v1alpha1/playlist.proto

reviewed

··· 45 45 } 46 46 47 47 message ResumeTrackRequest { 48 48 + int32 start_index = 1; 49 49 + uint32 crc = 2; 50 50 + uint64 elapsed = 3; 51 51 + uint64 offset = 4; 48 52 } 49 53 50 54 message ResumeTrackResponse {

+10 -1

crates/rpc/src/api/rockbox.v1alpha1.rs

reviewed

··· 2000 2000 #[derive(Clone, Copy, PartialEq, ::prost::Message)] 2001 2001 pub struct PlaylistResumeResponse {} 2002 2002 #[derive(Clone, Copy, PartialEq, ::prost::Message)] 2003 2003 - pub struct ResumeTrackRequest {} 2003 2003 + pub struct ResumeTrackRequest { 2004 2004 + #[prost(int32, tag = "1")] 2005 2005 + pub start_index: i32, 2006 2006 + #[prost(uint32, tag = "2")] 2007 2007 + pub crc: u32, 2008 2008 + #[prost(uint64, tag = "3")] 2009 2009 + pub elapsed: u64, 2010 2010 + #[prost(uint64, tag = "4")] 2011 2011 + pub offset: u64, 2012 2012 + } 2004 2013 #[derive(Clone, Copy, PartialEq, ::prost::Message)] 2005 2014 pub struct ResumeTrackResponse {} 2006 2015 #[derive(Clone, Copy, PartialEq, ::prost::Message)]

crates/rpc/src/api/rockbox_descriptor.bin

reviewed

This is a binary file and will not be displayed.

+6

crates/rpc/src/playlist.rs

reviewed

··· 74 74 &self, 75 75 request: tonic::Request<ResumeTrackRequest>, 76 76 ) -> Result<tonic::Response<ResumeTrackResponse>, tonic::Status> { 77 77 + let params = request.into_inner(); 78 78 + self.cmd_tx 79 79 + .lock() 80 80 + .unwrap() 81 81 + .send(RockboxCommand::PlaylistResumeTrack) 82 82 + .map_err(|_| tonic::Status::internal("Failed to send command"))?; 77 83 Ok(tonic::Response::new(ResumeTrackResponse::default())) 78 84 } 79 85

+12

crates/server/src/lib.rs

reviewed

··· 94 94 "/playlist_resume" => { 95 95 rb::playlist::resume(); 96 96 } 97 97 + "/playlist_resume_track" => { 98 98 + let status = unsafe { &rb::global_status }; 99 99 + rb::playlist::resume_track( 100 100 + status.resume_index, 101 101 + status.resume_crc32, 102 102 + status.resume_elapsed.into(), 103 103 + status.resume_offset.into(), 104 104 + ); 105 105 + } 97 106 _ => { 98 107 if path.starts_with("/play") { 99 108 let params: Vec<_> = path.split('?').collect(); ··· 168 177 } 169 178 RockboxCommand::PlaylistResume => { 170 179 reqwest::blocking::get(&format!("{}/playlist_resume", url)).unwrap(); 180 180 + } 181 181 + RockboxCommand::PlaylistResumeTrack => { 182 182 + reqwest::blocking::get(&format!("{}/playlist_resume_track", url)).unwrap(); 171 183 } 172 184 } 173 185 }

+1

crates/sys/src/events.rs

reviewed

··· 8 8 FlushAndReloadTracks, 9 9 Stop, 10 10 PlaylistResume, 11 11 + PlaylistResumeTrack, 11 12 }

+18

crates/sys/src/lib.rs

reviewed

··· 604 604 ListEdgeBeepNoWrap, 605 605 } 606 606 607 607 + #[repr(C)] 608 608 + #[derive(Debug)] 609 609 + pub struct SystemStatus { 610 610 + pub resume_index: i32, 611 611 + pub resume_crc32: u32, 612 612 + pub resume_elapsed: u32, 613 613 + pub resume_offset: u32, 614 614 + pub runtime: i32, 615 615 + pub topruntime: i32, 616 616 + pub dircache_size: i32, 617 617 + pub last_screen: i8, 618 618 + pub viewer_icon_count: i32, 619 619 + pub last_volume_change: i32, 620 620 + pub font_id: [i32; NB_SCREENS], 621 621 + } 622 622 + 607 623 extern "C" { 624 624 + pub static global_status: SystemStatus; 625 625 + 608 626 // Playback control 609 627 fn audio_pause() -> c_void; 610 628 fn audio_play(elapsed: c_long, offset: c_long) -> c_void;