From 649b669f16b5c80184b57551fdd6a3fbe8ca9bfd Mon Sep 17 00:00:00 2001 From: Xerus <27jf@web.de> Date: Fri, 22 Mar 2019 16:19:59 +0100 Subject: [PATCH] Update dbus-java to 3.0.2 --- build.gradle.kts | 2 +- extensions/src/xerus/mpris/AbstractMPRISPlayer.kt | 8 ++++---- extensions/src/xerus/mpris/DBusPropertyDelegate.kt | 4 ++-- extensions/src/xerus/mpris/DefaultDBus.kt | 5 +++-- extensions/src/xerus/mpris/PropertyMap.kt | 2 +- extensions/src/xerus/mpris/Track.kt | 2 +- extensions/test/xerus/mpris/MPRISPlayer.kt | 9 ++++----- src/main/org/mpris/MediaPlayer2/DBusPlayer.kt | 6 +++--- src/main/org/mpris/MediaPlayer2/MediaPlayer2.kt | 4 ++-- src/main/org/mpris/MediaPlayer2/Playlists.kt | 8 ++++---- src/main/org/mpris/MediaPlayer2/TrackList.kt | 8 ++++---- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index c37d56f..ebd969b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,6 +17,6 @@ allprojects { } dependencies { - compile("com.github.hypfvieh", "dbus-java", "2.7.5") + compile("com.github.hypfvieh", "dbus-java", "3.0.2") compile(kotlin("stdlib")) } \ No newline at end of file diff --git a/extensions/src/xerus/mpris/AbstractMPRISPlayer.kt b/extensions/src/xerus/mpris/AbstractMPRISPlayer.kt index c669629..e7af253 100644 --- a/extensions/src/xerus/mpris/AbstractMPRISPlayer.kt +++ b/extensions/src/xerus/mpris/AbstractMPRISPlayer.kt @@ -1,8 +1,8 @@ package xerus.mpris import org.freedesktop.DBus -import org.freedesktop.dbus.DBusConnection -import org.freedesktop.dbus.Variant +import org.freedesktop.dbus.connections.impl.DBusConnection +import org.freedesktop.dbus.types.Variant import org.mpris.MediaPlayer2.* /** Provides a typesafe foundation for implementing an MPRISPlayer. @@ -14,7 +14,7 @@ import org.mpris.MediaPlayer2.* * */ abstract class AbstractMPRISPlayer: MediaPlayerX, PlayerX, DefaultDBus { - val connection: DBusConnection = DBusConnection.getConnection(DBusConnection.SESSION) + val connection: DBusConnection = DBusConnection.getConnection(DBusConnection.DBusBusType.SESSION) val properties = HashMap>>() internal val propertyListeners = HashMap Unit>() @@ -35,7 +35,7 @@ abstract class AbstractMPRISPlayer: MediaPlayerX, PlayerX, DefaultDBus { /** sends a [DBus.Properties.PropertiesChanged] signal via [connection] */ override fun propertyChanged(interface_name: String, property_name: String) = - super.propertyChanged(interface_name, property_name).also { connection.sendSignal(it) } + super.propertyChanged(interface_name, property_name).also { connection.sendMessage(it) } override val hasTrackList by DBusConstant(this is TrackList) diff --git a/extensions/src/xerus/mpris/DBusPropertyDelegate.kt b/extensions/src/xerus/mpris/DBusPropertyDelegate.kt index 436920b..703c8e2 100644 --- a/extensions/src/xerus/mpris/DBusPropertyDelegate.kt +++ b/extensions/src/xerus/mpris/DBusPropertyDelegate.kt @@ -3,7 +3,7 @@ package xerus.mpris import javafx.beans.value.ObservableValue -import org.freedesktop.dbus.DBusInterfaceName +import org.freedesktop.dbus.annotations.DBusInterfaceName import org.slf4j.LoggerFactory import kotlin.properties.ReadOnlyProperty import kotlin.properties.ReadWriteProperty @@ -99,7 +99,7 @@ private class Property(private val interfaceName: String, private val na println("setting $name in $interfaceName to $value") try { if(thisRef.properties.getValue(interfaceName).put(name, value.variant())?.value != value) - thisRef.connection.sendSignal(thisRef.propertyChanged(interfaceName, name)) + thisRef.connection.sendMessage(thisRef.propertyChanged(interfaceName, name)) } catch(t: Throwable) { t.printStackTrace() } diff --git a/extensions/src/xerus/mpris/DefaultDBus.kt b/extensions/src/xerus/mpris/DefaultDBus.kt index 8bb03b7..612f7b1 100644 --- a/extensions/src/xerus/mpris/DefaultDBus.kt +++ b/extensions/src/xerus/mpris/DefaultDBus.kt @@ -1,12 +1,13 @@ package xerus.mpris -import org.freedesktop.DBus.Properties -import org.freedesktop.dbus.Variant +import org.freedesktop.dbus.interfaces.Properties import org.freedesktop.dbus.types.DBusMapType +import org.freedesktop.dbus.types.Variant import java.security.InvalidParameterException import java.util.* import kotlin.reflect.KClass + fun Any.variant(): Variant<*> { if(this is Variant<*>) return this diff --git a/extensions/src/xerus/mpris/PropertyMap.kt b/extensions/src/xerus/mpris/PropertyMap.kt index 8fa3290..91bb902 100644 --- a/extensions/src/xerus/mpris/PropertyMap.kt +++ b/extensions/src/xerus/mpris/PropertyMap.kt @@ -1,6 +1,6 @@ package xerus.mpris -import org.freedesktop.dbus.Variant +import org.freedesktop.dbus.types.Variant import java.util.* class PropertyMap private constructor(private val map: MutableMap>): MutableMap> by map { diff --git a/extensions/src/xerus/mpris/Track.kt b/extensions/src/xerus/mpris/Track.kt index b0122f9..e708086 100644 --- a/extensions/src/xerus/mpris/Track.kt +++ b/extensions/src/xerus/mpris/Track.kt @@ -1,6 +1,6 @@ package xerus.mpris -import org.freedesktop.dbus.Variant +import org.freedesktop.dbus.types.Variant /** Represents a Track with Metadata. * This is not an actual DBus-object, but rather a convenience wrapper around the metadata. */ diff --git a/extensions/test/xerus/mpris/MPRISPlayer.kt b/extensions/test/xerus/mpris/MPRISPlayer.kt index 1f57993..35f72a7 100644 --- a/extensions/test/xerus/mpris/MPRISPlayer.kt +++ b/extensions/test/xerus/mpris/MPRISPlayer.kt @@ -1,9 +1,8 @@ package xerus.mpris -import org.freedesktop.DBus -import org.freedesktop.DBus.Properties.PropertiesChanged -import org.freedesktop.dbus.Variant +import org.freedesktop.dbus.interfaces.Properties import org.freedesktop.dbus.types.DBusMapType +import org.freedesktop.dbus.types.Variant import org.mpris.MediaPlayer2.LoopStatus import org.mpris.MediaPlayer2.MediaPlayer2 import org.mpris.MediaPlayer2.PlaybackStatus @@ -19,7 +18,7 @@ fun main() { MPRISPlayer().exportAs(playerName) } -class MPRISPlayer: AbstractMPRISPlayer(), MediaPlayer2, Player, DBus.Properties { +class MPRISPlayer: AbstractMPRISPlayer(), MediaPlayer2, Player, Properties { override var playbackStatus by DBusProperty(PlaybackStatus.Stopped) override var loopStatus: LoopStatus = LoopStatus.None @@ -116,7 +115,7 @@ class MPRISPlayer: AbstractMPRISPlayer(), MediaPlayer2, Player, DBus.Properties val new = Variant(value) properties[interface_name]!![name] = new try { - connection.sendSignal(PropertiesChanged("/org/mpris/MediaPlayer2", interface_name, Collections.singletonMap(name, new) as Map>, Collections.emptyList())) + connection.sendMessage(Properties.PropertiesChanged("/org/mpris/MediaPlayer2", interface_name, Collections.singletonMap(name, new) as Map>, Collections.emptyList())) } catch(e: Throwable) { e.printStackTrace() } diff --git a/src/main/org/mpris/MediaPlayer2/DBusPlayer.kt b/src/main/org/mpris/MediaPlayer2/DBusPlayer.kt index 8b301e3..c85cdf9 100644 --- a/src/main/org/mpris/MediaPlayer2/DBusPlayer.kt +++ b/src/main/org/mpris/MediaPlayer2/DBusPlayer.kt @@ -2,9 +2,9 @@ package org.mpris.MediaPlayer2 -import org.freedesktop.dbus.DBusInterface -import org.freedesktop.dbus.DBusInterfaceName -import org.freedesktop.dbus.DBusSignal +import org.freedesktop.dbus.annotations.DBusInterfaceName +import org.freedesktop.dbus.interfaces.DBusInterface +import org.freedesktop.dbus.messages.DBusSignal /** [https://specifications.freedesktop.org/mpris-spec/latest/Player_Interface.html] * diff --git a/src/main/org/mpris/MediaPlayer2/MediaPlayer2.kt b/src/main/org/mpris/MediaPlayer2/MediaPlayer2.kt index de13fb5..5db4efc 100644 --- a/src/main/org/mpris/MediaPlayer2/MediaPlayer2.kt +++ b/src/main/org/mpris/MediaPlayer2/MediaPlayer2.kt @@ -1,7 +1,7 @@ package org.mpris.MediaPlayer2 -import org.freedesktop.dbus.DBusInterface -import org.freedesktop.dbus.DBusInterfaceName +import org.freedesktop.dbus.annotations.DBusInterfaceName +import org.freedesktop.dbus.interfaces.DBusInterface /** [https://specifications.freedesktop.org/mpris-spec/latest/Media_Player.html] * diff --git a/src/main/org/mpris/MediaPlayer2/Playlists.kt b/src/main/org/mpris/MediaPlayer2/Playlists.kt index 862fa4d..f2f0922 100644 --- a/src/main/org/mpris/MediaPlayer2/Playlists.kt +++ b/src/main/org/mpris/MediaPlayer2/Playlists.kt @@ -2,11 +2,11 @@ package org.mpris.MediaPlayer2 -import org.freedesktop.dbus.DBusInterface -import org.freedesktop.dbus.DBusInterfaceName -import org.freedesktop.dbus.DBusSignal -import org.freedesktop.dbus.Position import org.freedesktop.dbus.Struct +import org.freedesktop.dbus.annotations.DBusInterfaceName +import org.freedesktop.dbus.annotations.Position +import org.freedesktop.dbus.interfaces.DBusInterface +import org.freedesktop.dbus.messages.DBusSignal typealias PlaylistId = DBusPath diff --git a/src/main/org/mpris/MediaPlayer2/TrackList.kt b/src/main/org/mpris/MediaPlayer2/TrackList.kt index 7296b31..afc82f1 100644 --- a/src/main/org/mpris/MediaPlayer2/TrackList.kt +++ b/src/main/org/mpris/MediaPlayer2/TrackList.kt @@ -2,10 +2,10 @@ package org.mpris.MediaPlayer2 -import org.freedesktop.dbus.DBusInterface -import org.freedesktop.dbus.DBusInterfaceName -import org.freedesktop.dbus.DBusSignal -import org.freedesktop.dbus.Variant +import org.freedesktop.dbus.annotations.DBusInterfaceName +import org.freedesktop.dbus.interfaces.DBusInterface +import org.freedesktop.dbus.messages.DBusSignal +import org.freedesktop.dbus.types.Variant typealias TrackId = String