Skip to content

Commit 0713b79

Browse files
committed
Fix merge conflict
1 parent dfa2521 commit 0713b79

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

matter/src/data_model/cluster_media_playback.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -205,13 +205,13 @@ impl MediaPlaybackCluster {
205205
Attributes::CurrentState as u16,
206206
AttrValue::Uint8(PlaybackState::Playing as u8),
207207
)?;
208-
Err(IMStatusCode::Sucess)
208+
Err(IMStatusCode::Success)
209209
}
210210

211211
fn _set_duration(&mut self, duration: u64) -> Result<(), IMStatusCode> {
212212
self.base
213213
.write_attribute_raw(Attributes::Duration as u16, AttrValue::Uint64(duration))?;
214-
Err(IMStatusCode::Sucess)
214+
Err(IMStatusCode::Success)
215215
}
216216

217217
// When rewinding / changing stream / etc we need to change absolute position and updateAt
@@ -221,7 +221,7 @@ impl MediaPlaybackCluster {
221221
self.sampled_position.position = new_pos;
222222
self.sampled_position.updated_at = now;
223223

224-
Err(IMStatusCode::Sucess)
224+
Err(IMStatusCode::Success)
225225
}
226226

227227
fn enocde_sampled_position(&self, tag: TagType, tw: &mut TLVWriter) {
@@ -242,7 +242,7 @@ impl MediaPlaybackCluster {
242242

243243
self.run_callback(Commands::Play);
244244
self.send_playback_response(CommandStatus::Success, cmd_req);
245-
Err(IMStatusCode::Sucess)
245+
Err(IMStatusCode::Success)
246246
}
247247
fn handle_pause(&mut self, cmd_req: &mut CommandReq) -> Result<(), IMStatusCode> {
248248
self.base.write_attribute_raw(
@@ -252,7 +252,7 @@ impl MediaPlaybackCluster {
252252

253253
self.run_callback(Commands::Pause);
254254
self.send_playback_response(CommandStatus::Success, cmd_req);
255-
Err(IMStatusCode::Sucess)
255+
Err(IMStatusCode::Success)
256256
}
257257
fn handle_stop(&mut self, cmd_req: &mut CommandReq) -> Result<(), IMStatusCode> {
258258
self.base.write_attribute_raw(
@@ -262,7 +262,7 @@ impl MediaPlaybackCluster {
262262

263263
self.run_callback(Commands::Stop);
264264
self.send_playback_response(CommandStatus::Success, cmd_req);
265-
Err(IMStatusCode::Sucess)
265+
Err(IMStatusCode::Success)
266266
}
267267

268268
// Start current thinbg over
@@ -275,7 +275,7 @@ impl MediaPlaybackCluster {
275275
self.update_position(0)?;
276276
self.run_callback(Commands::StartOver);
277277
self.send_playback_response(CommandStatus::Success, cmd_req);
278-
Err(IMStatusCode::Sucess)
278+
Err(IMStatusCode::Success)
279279
}
280280

281281
fn handle_next(&mut self, cmd_req: &mut CommandReq) -> Result<(), IMStatusCode> {

0 commit comments

Comments
 (0)