diff --git a/README.md b/README.md index 837543e..1488a78 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ represent the application defaults. You may live-reload your updated configuration by right-clicking on the TotalMix Volume Control tray icon and selecting "Reload config" which will update all settings except those related to -OSC (i.e. hostnames and ports). You will need to restart the application if you wish to change +OSC (i.e. addresses and ports). You will need to restart the application if you wish to change OSC settings. ## Building from Source diff --git a/config.sample.toml b/config.sample.toml index 0febf1b..1c4c0ca 100644 --- a/config.sample.toml +++ b/config.sample.toml @@ -7,15 +7,15 @@ # ARGB components (note that the alpha channel needs to be first if you ant transparency). [osc] -# The hostname port that TotalMix Volume Control should send to. TotalMixFX listens on 0.0.0.0 so -# the hostname may be any IP address on your network. Generally 127.0.0.1 (localhost) is +# The address and port that TotalMix Volume Control should send to. TotalMixFX listens on 0.0.0.0 +# so the address may be any IP address on your network. Generally 127.0.0.1 (localhost) is # recommended. The port should be set to match the "Port incoming" setting in TotalMixFX. -outgoing_hostname = "127.0.0.1" +outgoing_address = "127.0.0.1" outgoing_port = 7001 -# The hostname and port that TotalMix Volume Control should receive from. This should be set to +# The address and port that TotalMix Volume Control should receive from. This should be set to # match the "Port outgoing" setting in TotalMixFX. -incoming_hostname = "127.0.0.1" +incoming_address = "127.0.0.1" incoming_port = 9001 [volume] diff --git a/src/TotalMixVC/App.xaml.cs b/src/TotalMixVC/App.xaml.cs index 821b899..3f7c329 100644 --- a/src/TotalMixVC/App.xaml.cs +++ b/src/TotalMixVC/App.xaml.cs @@ -324,8 +324,8 @@ protected override void OnStartup(StartupEventArgs e) try { _volumeManager = new( - outgoingEP: new IPEndPoint(_config.Osc.OutgoingHostname, _config.Osc.OutgoingPort), - incomingEP: new IPEndPoint(_config.Osc.IncomingHostname, _config.Osc.IncomingPort) + outgoingEP: new IPEndPoint(_config.Osc.OutgoingAddress, _config.Osc.OutgoingPort), + incomingEP: new IPEndPoint(_config.Osc.IncomingAddress, _config.Osc.IncomingPort) ); } catch (SocketException) @@ -333,7 +333,7 @@ protected override void OnStartup(StartupEventArgs e) MessageBox.Show( "Unable to open a listener to receive events from the device. Please exit any " + "applications that are binding to UDP address " - + $"{_config.Osc.OutgoingHostname}:{_config.Osc.OutgoingPort} and try " + + $"{_config.Osc.OutgoingAddress}:{_config.Osc.OutgoingPort} and try " + "again.\n\nThe application will now exit.", caption: "Socket Error", button: MessageBoxButton.OK, @@ -489,7 +489,7 @@ await _joinableTaskFactory.SwitchToMainThreadAsync( s_communicationErrorFormatString, _config.Osc.OutgoingPort, _config.Osc.IncomingPort, - _config.Osc.IncomingHostname + _config.Osc.IncomingAddress ); _trayIcon.ToolTipText = "TotalMixVC - Unable to connect to your device"; } diff --git a/src/TotalMixVC/Configuration/Osc.cs b/src/TotalMixVC/Configuration/Osc.cs index 9d1fe94..1a2e903 100644 --- a/src/TotalMixVC/Configuration/Osc.cs +++ b/src/TotalMixVC/Configuration/Osc.cs @@ -7,9 +7,9 @@ namespace TotalMixVC.Configuration; /// Provides configuration related to OSC communication with the device. public record Osc { - /// Gets the hostname to send volume changes to. + /// Gets the address to send volume changes to. [JsonConverter(typeof(IPAddressConverter))] - public IPAddress OutgoingHostname { get; init; } = IPAddress.Loopback; + public IPAddress OutgoingAddress { get; init; } = IPAddress.Loopback; /// /// Gets the port to use when sending volume changes. This should match the "Port incoming" @@ -18,10 +18,10 @@ public record Osc [JsonConverter(typeof(PortIntegerConverter))] public int OutgoingPort { get; init; } = 7001; - /// Gets the hostname to receive volume changes from. This should match the + /// Gets the address to receive volume changes from. This should match the /// "Remote Controller Address" and should typically be "127.0.0.1". [JsonConverter(typeof(IPAddressConverter))] - public IPAddress IncomingHostname { get; init; } = IPAddress.Loopback; + public IPAddress IncomingAddress { get; init; } = IPAddress.Loopback; /// /// Gets the port to use when receiving volume changes. This should match the "Port outgoing"