From c752c75c2021b08409566d025199979461bdc37b Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Tue, 29 Dec 2020 19:42:37 +0000 Subject: [PATCH] obsolete API --- src/cli/Commands/Streamer.cs | 2 +- src/cli/Settings/ConnectionSettings.cs | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/cli/Commands/Streamer.cs b/src/cli/Commands/Streamer.cs index 75eddca6..34731c6a 100644 --- a/src/cli/Commands/Streamer.cs +++ b/src/cli/Commands/Streamer.cs @@ -79,7 +79,7 @@ namespace cli { async Task DoStream (Stream stream) { _tokenSource = new CancellationTokenSource(); - var url = _cxSettings.NStreamingUrl + "/" + HttpUtility.UrlEncode(_destArg.Value); + var url = _cxSettings.StreamingUrl + "/" + HttpUtility.UrlEncode(_destArg.Value); _logger.LogInformation("Connecting to " + url); await _client.ConnectAsync(new Uri(url), _tokenSource.Token); diff --git a/src/cli/Settings/ConnectionSettings.cs b/src/cli/Settings/ConnectionSettings.cs index 11c8e321..04cc2422 100644 --- a/src/cli/Settings/ConnectionSettings.cs +++ b/src/cli/Settings/ConnectionSettings.cs @@ -36,17 +36,10 @@ namespace cli $"{SiteAccessSheme}://{Authority}:{Port}/token"; } } + [NotMapped] [JsonIgnore] public string StreamingUrl { get { - return Port==0 ? $"ws://{Authority}"+Constants.LivePath: - $"ws://{Authority}:{Port}"+Constants.LivePath; - } } - - - [NotMapped] - [JsonIgnore] - public string NStreamingUrl { get { return Port==0 ? $"ws://{Authority}"+Constants.StreamingPath: $"ws://{Authority}:{Port}"+Constants.StreamingPath; } }