kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Kotlin-Logging instead of system calls

Browse Source
This commit is contained in:
Ricardo Matias
2019-11-07 11:03:30 +01:00
parent ac86de9ba6
commit eb7c1d5f49
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
orx-osc/src/main/kotlin/OSC.kt
View File

@@ -6,15 +6,18 @@ import com.illposed.osc.messageselector.OSCPatternAddressMessageSelector
import com.illposed.osc.transport.udp.OSCPort import com.illposed.osc.transport.udp.OSCPort
import com.illposed.osc.transport.udp.OSCPortIn import com.illposed.osc.transport.udp.OSCPortIn
import com.illposed.osc.transport.udp.OSCPortOut import com.illposed.osc.transport.udp.OSCPortOut
import mu.KotlinLogging
import java.net.InetAddress import java.net.InetAddress
import java.net.PortUnreachableException import java.net.PortUnreachableException
private typealias OSCListener = Pair<OSCPatternAddressMessageSelector, OSCMessageListener> private typealias OSCListener = Pair<OSCPatternAddressMessageSelector, OSCMessageListener>
private val logger = KotlinLogging.logger {}
class OSC ( class OSC (
address: InetAddress = InetAddress.getLocalHost(), val address: InetAddress = InetAddress.getLocalHost(),
portIn: Int = OSCPort.DEFAULT_SC_OSC_PORT, val portIn: Int = OSCPort.DEFAULT_SC_OSC_PORT,
portOut: Int = portIn val portOut: Int = portIn
) { ) {
private val receiver: OSCPortIn = OSCPortIn(portIn) private val receiver: OSCPortIn = OSCPortIn(portIn)
private val sender: OSCPortOut = OSCPortOut(address, portOut) private val sender: OSCPortOut = OSCPortOut(address, portOut)
@@ -29,10 +32,9 @@ class OSC (
sender.send(msg) sender.send(msg)
} catch (ex: Exception) { } catch (ex: Exception) {
when(ex) { when(ex) {
is PortUnreachableException -> System.err.println("Error: Could not connect to OUT port") is PortUnreachableException -> logger.error(ex) { "Error: Could not connect to OUT port" }
is IllegalStateException -> System.err.println("Error: Couldn't send message to channel: $channel") is IllegalStateException -> logger.error(ex) { "Error: Couldn't send message to channel: $channel" }
} }
// ex.printStackTrace() - Would rather keep this behind a debug flag
} }
} }
@@ -64,6 +66,6 @@ class OSC (
receiver.startListening() receiver.startListening()
if (receiver.isListening) println("OSC is listening..") if (receiver.isListening) logger.info("OSC is listening on port: $portIn")
} }
} }