evie/rs-matter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #30 from kedars/bugfix/merge_conflict

Browse source 
Fix merge conflict
This commit is contained in:
Kedar Sovani 2023-02-28 17:03:00 +05:30 • committed by GitHub
commit 566db62404
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
matter/src/data_model/cluster_media_playback.rs
View file

@ -205,13 +205,13 @@ impl MediaPlaybackCluster {
Attributes::CurrentState as u16, Attributes::CurrentState as u16,
AttrValue::Uint8(PlaybackState::Playing as u8), AttrValue::Uint8(PlaybackState::Playing as u8),
)?; )?;
Err(IMStatusCode::Sucess) Err(IMStatusCode::Success)
} }
fn _set_duration(&mut self, duration: u64) -> Result<(), IMStatusCode> { fn _set_duration(&mut self, duration: u64) -> Result<(), IMStatusCode> {
self.base self.base
.write_attribute_raw(Attributes::Duration as u16, AttrValue::Uint64(duration))?; .write_attribute_raw(Attributes::Duration as u16, AttrValue::Uint64(duration))?;
Err(IMStatusCode::Sucess) Err(IMStatusCode::Success)
} }
// When rewinding / changing stream / etc we need to change absolute position and updateAt // When rewinding / changing stream / etc we need to change absolute position and updateAt
@ -221,7 +221,7 @@ impl MediaPlaybackCluster {
self.sampled_position.position = new_pos; self.sampled_position.position = new_pos;
self.sampled_position.updated_at = now; self.sampled_position.updated_at = now;
Err(IMStatusCode::Sucess) Err(IMStatusCode::Success)
} }
fn enocde_sampled_position(&self, tag: TagType, tw: &mut TLVWriter) { fn enocde_sampled_position(&self, tag: TagType, tw: &mut TLVWriter) {
@ -242,7 +242,7 @@ impl MediaPlaybackCluster {
self.run_callback(Commands::Play); self.run_callback(Commands::Play);
self.send_playback_response(CommandStatus::Success, cmd_req); self.send_playback_response(CommandStatus::Success, cmd_req);
Err(IMStatusCode::Sucess) Err(IMStatusCode::Success)
} }
fn handle_pause(&mut self, cmd_req: &mut CommandReq) -> Result<(), IMStatusCode> { fn handle_pause(&mut self, cmd_req: &mut CommandReq) -> Result<(), IMStatusCode> {
self.base.write_attribute_raw( self.base.write_attribute_raw(
@ -252,7 +252,7 @@ impl MediaPlaybackCluster {
self.run_callback(Commands::Pause); self.run_callback(Commands::Pause);
self.send_playback_response(CommandStatus::Success, cmd_req); self.send_playback_response(CommandStatus::Success, cmd_req);
Err(IMStatusCode::Sucess) Err(IMStatusCode::Success)
} }
fn handle_stop(&mut self, cmd_req: &mut CommandReq) -> Result<(), IMStatusCode> { fn handle_stop(&mut self, cmd_req: &mut CommandReq) -> Result<(), IMStatusCode> {
self.base.write_attribute_raw( self.base.write_attribute_raw(
@ -262,7 +262,7 @@ impl MediaPlaybackCluster {
self.run_callback(Commands::Stop); self.run_callback(Commands::Stop);
self.send_playback_response(CommandStatus::Success, cmd_req); self.send_playback_response(CommandStatus::Success, cmd_req);
Err(IMStatusCode::Sucess) Err(IMStatusCode::Success)
} }
// Start current thinbg over // Start current thinbg over
@ -275,7 +275,7 @@ impl MediaPlaybackCluster {
self.update_position(0)?; self.update_position(0)?;
self.run_callback(Commands::StartOver); self.run_callback(Commands::StartOver);
self.send_playback_response(CommandStatus::Success, cmd_req); self.send_playback_response(CommandStatus::Success, cmd_req);
Err(IMStatusCode::Sucess) Err(IMStatusCode::Success)
} }
fn handle_next(&mut self, cmd_req: &mut CommandReq) -> Result<(), IMStatusCode> { fn handle_next(&mut self, cmd_req: &mut CommandReq) -> Result<(), IMStatusCode> {