diff --git a/Riot/Modules/VoiceBroadcast/VoiceBroadcastSDK/VoiceBroadcastAggregator.swift b/Riot/Modules/VoiceBroadcast/VoiceBroadcastSDK/VoiceBroadcastAggregator.swift index 2c619b4f7..965072ca3 100644 --- a/Riot/Modules/VoiceBroadcast/VoiceBroadcastSDK/VoiceBroadcastAggregator.swift +++ b/Riot/Modules/VoiceBroadcast/VoiceBroadcastSDK/VoiceBroadcastAggregator.swift @@ -48,7 +48,7 @@ public class VoiceBroadcastAggregator { private var events: [MXEvent] = [] - public private(set) var voiceBroadcast: VoiceBroadcastProtocol! { + public private(set) var voiceBroadcast: VoiceBroadcast! { didSet { delegate?.voiceBroadcastAggregatorDidUpdateData(self) } diff --git a/Riot/Modules/VoiceBroadcast/VoiceBroadcastSDK/VoiceBroadcastBuilder.swift b/Riot/Modules/VoiceBroadcast/VoiceBroadcastSDK/VoiceBroadcastBuilder.swift index 187ce02a8..b63f828af 100644 --- a/Riot/Modules/VoiceBroadcast/VoiceBroadcastSDK/VoiceBroadcastBuilder.swift +++ b/Riot/Modules/VoiceBroadcast/VoiceBroadcastSDK/VoiceBroadcastBuilder.swift @@ -18,7 +18,7 @@ import Foundation struct VoiceBroadcastBuilder { - func build(voiceBroadcastStartEventContent: VoiceBroadcastInfo, events: [MXEvent], currentUserIdentifier: String, hasBeenEdited: Bool = false) -> VoiceBroadcastProtocol { + func build(voiceBroadcastStartEventContent: VoiceBroadcastInfo, events: [MXEvent], currentUserIdentifier: String, hasBeenEdited: Bool = false) -> VoiceBroadcast { let voiceBroadcast = VoiceBroadcast() diff --git a/Riot/Modules/VoiceBroadcast/VoiceBroadcastSDK/VoiceBroadcastModels.swift b/Riot/Modules/VoiceBroadcast/VoiceBroadcastSDK/VoiceBroadcastModels.swift index c5be1ae14..138af9e32 100644 --- a/Riot/Modules/VoiceBroadcast/VoiceBroadcastSDK/VoiceBroadcastModels.swift +++ b/Riot/Modules/VoiceBroadcast/VoiceBroadcastSDK/VoiceBroadcastModels.swift @@ -16,17 +16,12 @@ import Foundation -public protocol VoiceBroadcastProtocol { - var chunks: Set { get } - var kind: VoiceBroadcastKind { get } -} - public enum VoiceBroadcastKind { case player case recorder } -class VoiceBroadcast: VoiceBroadcastProtocol { +public struct VoiceBroadcast { var chunks: Set = [] var kind: VoiceBroadcastKind = .player } diff --git a/RiotSwiftUI/Modules/Room/TimelineVoiceBroadcast/Coordinator/VoiceBroadcastPlaybackController.swift b/RiotSwiftUI/Modules/Room/TimelineVoiceBroadcast/Coordinator/VoiceBroadcastPlaybackController.swift index 4650530cc..1eb579fd7 100644 --- a/RiotSwiftUI/Modules/Room/TimelineVoiceBroadcast/Coordinator/VoiceBroadcastPlaybackController.swift +++ b/RiotSwiftUI/Modules/Room/TimelineVoiceBroadcast/Coordinator/VoiceBroadcastPlaybackController.swift @@ -100,9 +100,9 @@ final class VoiceBroadcastPlaybackController: Coordinator, Presentable, VoiceBro // MARK: - Private - // VoiceBroadcastProtocol is intentionally not available in the SwiftUI target as we don't want + // VoiceBroadcast is intentionally not available in the SwiftUI target as we don't want // to add the SDK as a dependency to it. We need to translate from one to the other on this level. - func buildTimelineVoiceBroadcastFrom(_ voiceBroadcast: VoiceBroadcastProtocol) -> TimelineVoiceBroadcastDetails { + func buildTimelineVoiceBroadcastFrom(_ voiceBroadcast: VoiceBroadcast) -> TimelineVoiceBroadcastDetails { return TimelineVoiceBroadcastDetails(chunks: Array(voiceBroadcast.chunks), type: voiceBroadcastKindToTimelineVoiceBroadcastType(voiceBroadcast.kind)) }