@@ -37,7 +37,7 @@ use std::sync::{Arc, PoisonError, RwLock};
3737use crate :: doc:: { DocError , SessionDoc } ;
3838use crate :: ext:: ExtensionData ;
3939use crate :: id:: { ExtensionId , ItemId , LaneId , MarkId } ;
40- use crate :: timeline:: { Item , Lane , Marker , Region , TempoMap } ;
40+ use crate :: timeline:: { Item , Lane , Marker , Region , TempoMap , Time } ;
4141use crate :: value:: Value ;
4242
4343/// What the host granted the caller beyond its own namespace.
@@ -91,6 +91,9 @@ pub enum Request {
9191 RemoveItem { id : ItemId } ,
9292 /// Sets the tempo map (needs [`Grants::structure`]).
9393 SetTempo { tempo : TempoMapData } ,
94+ /// Sets where the song's bar 1 is (`None`: the session's start; needs
95+ /// [`Grants::structure`]).
96+ SetBarOne { at : Option < Time > } ,
9497 /// Puts a marker (needs [`Grants::structure`]).
9598 PutMarker { id : MarkId , marker : Marker } ,
9699 /// Puts a region (needs [`Grants::structure`]).
@@ -184,6 +187,10 @@ pub enum Response {
184187 tempo : TempoMapData ,
185188 markers : BTreeMap < MarkId , Marker > ,
186189 regions : BTreeMap < MarkId , Region > ,
190+ /// Where the song's bar 1 is (`crate::Session::bar_one`); `None`:
191+ /// the session's start. Absent from an older host's answer.
192+ #[ facet( default ) ]
193+ bar_one : Option < Time > ,
187194 } ,
188195 /// What changed since the version asked about: `whole` when that
189196 /// version is unknown (read everything again), else `changes`. The
@@ -243,6 +250,7 @@ pub const fn action_for(request: &Request) -> &'static str {
243250 | Request :: ReadStructure
244251 | Request :: ReadChanges { .. } => READ ,
245252 Request :: SetTempo { .. }
253+ | Request :: SetBarOne { .. }
246254 | Request :: PutMarker { .. }
247255 | Request :: PutRegion { .. }
248256 | Request :: RemoveMark { .. } => STRUCTURE ,
@@ -335,13 +343,15 @@ pub fn handle(
335343 tempo : TempoMapData :: of ( & doc. tempo ( ) ) ,
336344 markers : doc. markers ( ) ,
337345 regions : doc. regions ( ) ,
346+ bar_one : doc. bar_one ( ) ,
338347 } ) ,
339348 Request :: ReadTimeline
340349 | Request :: PutLane { .. }
341350 | Request :: RemoveLane { .. }
342351 | Request :: PutItem { .. }
343352 | Request :: RemoveItem { .. } => timeline ( doc, caller, request) ,
344353 Request :: SetTempo { .. }
354+ | Request :: SetBarOne { .. }
345355 | Request :: PutMarker { .. }
346356 | Request :: PutRegion { .. }
347357 | Request :: RemoveMark { .. } => {
@@ -522,6 +532,10 @@ fn song_structure(doc: &SessionDoc, request: Request) -> Result<Response, Servic
522532 doc. set_tempo ( & tempo_map ( & tempo) ?) ?;
523533 Ok ( Response :: Done )
524534 }
535+ Request :: SetBarOne { at } => {
536+ doc. set_bar_one ( at) ?;
537+ Ok ( Response :: Done )
538+ }
525539 Request :: PutMarker { id, marker } => {
526540 doc. put_marker ( & id, & marker) ?;
527541 Ok ( Response :: Done )
0 commit comments