Skip to content

Commit

Permalink
more clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
sheiladoherty-dolby committed Jul 19, 2024
1 parent a61223e commit cd2eae0
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 52 deletions.
Binary file modified .DS_Store
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ public struct SubscriptionConfiguration {
rtcEventLogPath: String? = nil,
sdkLogPath: String? = nil,
enableStats: Bool = Constants.enableStats,
playoutDelay: MCForcePlayoutDelay? = Constants.playoutDelay)
{
playoutDelay: MCForcePlayoutDelay? = Constants.playoutDelay
) {
self.subscribeAPI = subscribeAPI
self.autoReconnect = autoReconnect
self.jitterMinimumDelayMs = jitterMinimumDelayMs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,19 @@ struct SavedStreamDetail: Identifiable, Equatable {
let maxBitrate: UInt?
let saveLogs: Bool

init(accountID: String,
streamName: String,
subscribeAPI: String,
videoJitterMinimumDelayInMs: UInt,
minPlayoutDelay: UInt?,
maxPlayoutDelay: UInt?,
disableAudio: Bool,
primaryVideoQuality: VideoQuality,
maxBitrate: UInt,
saveLogs: Bool,
dateProvider: DateProvider = DefaultDateProvider()) {
init(
accountID: String,
streamName: String,
subscribeAPI: String,
videoJitterMinimumDelayInMs: UInt,
minPlayoutDelay: UInt?,
maxPlayoutDelay: UInt?,
disableAudio: Bool,
primaryVideoQuality: VideoQuality,
maxBitrate: UInt,
saveLogs: Bool,
dateProvider: DateProvider = DefaultDateProvider()
) {
self.id = UUID()
self.accountID = accountID
self.streamName = streamName
Expand All @@ -46,12 +48,13 @@ struct SavedStreamDetail: Identifiable, Equatable {

extension SavedStreamDetail {
init?(managedObject: StreamDetailManagedObject) {
guard let accountID = managedObject.accountID,
let streamName = managedObject.streamName,
let lastUsedDate = managedObject.lastUsedDate,
let storedVideoQuality = managedObject.primaryVideoQuality,
let subscribeAPI = managedObject.subscribeAPI,
let primaryVideoQuality = VideoQuality(rawValue: storedVideoQuality)
guard
let accountID = managedObject.accountID,
let streamName = managedObject.streamName,
let lastUsedDate = managedObject.lastUsedDate,
let storedVideoQuality = managedObject.primaryVideoQuality,
let subscribeAPI = managedObject.subscribeAPI,
let primaryVideoQuality = VideoQuality(rawValue: storedVideoQuality)
else {
return nil
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ struct RecentStreamCell: View {

private let action: () -> Void

init(streamDetail: SavedStreamDetail,
action: @escaping () -> Void) {
init(streamDetail: SavedStreamDetail, action: @escaping () -> Void) {
self.streamDetail = streamDetail
self.action = action
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@ final class RecentStreamsViewModel: ObservableObject {
@Published private(set) var topStreamDetails: [SavedStreamDetail] = []
@Published private(set) var lastPlayedStream: SavedStreamDetail?

init(streamDataManager: StreamDataManagerProtocol = StreamDataManager.shared,
settingsManager: SettingsManager = .shared,
dateProvider: DateProvider = DefaultDateProvider()) {
init(
streamDataManager: StreamDataManagerProtocol = StreamDataManager.shared,
settingsManager: SettingsManager = .shared,
dateProvider: DateProvider = DefaultDateProvider()
) {
self.streamDataManager = streamDataManager
self.settingsManager = settingsManager
self.dateProvider = dateProvider
Expand Down Expand Up @@ -90,7 +92,8 @@ final class RecentStreamsViewModel: ObservableObject {
let sdkLogPath = streamDetail.saveLogs ? URL.sdkLogPath(for: currentDate) : nil
var playoutDelay: MCForcePlayoutDelay?
if let minPlayoutDelay = streamDetail.minPlayoutDelay,
let maxPlayoutDelay = streamDetail.maxPlayoutDelay {
let maxPlayoutDelay = streamDetail.maxPlayoutDelay
{
playoutDelay = MCForcePlayoutDelay(min: Int32(minPlayoutDelay), max: Int32(maxPlayoutDelay))
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -448,15 +448,13 @@ struct StreamDetailInputScreen: View {
return
}

let playoutDelay: MCForcePlayoutDelay? = showPlayoutDelay ? MCForcePlayoutDelay(min: Int32(minPlayoutDelay), max: Int32(maxPlayoutDelay)) : nil

let configuration = SubscriptionConfiguration(
subscribeAPI: productionSubscribeURL,
jitterMinimumDelayMs: jitterMinimumDelayMs,
disableAudio: disableAudio,
rtcEventLogPath: nil,
sdkLogPath: nil,
playoutDelay: playoutDelay
playoutDelay: nil
)
streamingScreenContext = StreamingView.Context(
streamName: streamName,
Expand Down
Binary file modified rts-viewer-ios/.DS_Store
Binary file not shown.

This file was deleted.

0 comments on commit cd2eae0

Please sign in to comment.