From: Mike Brady Date: Sun, 10 Sep 2017 12:32:27 +0000 (+0100) Subject: tidying up a few little thing X-Git-Tag: 3.2d8~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79a26aeaff8d268934799cc7585c8f15ecae7fe5;p=thirdparty%2Fshairport-sync.git tidying up a few little thing --- diff --git a/.gitignore b/.gitignore index 53812396..d2a7772d 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,12 @@ man/Makefile.in scripts/shairport-sync.service scripts/shairport-sync +#Some dbus files that are automatically generated +dbus/data/org.gnome.ShairportSync.service +dbus/src/shairport-sync-dbus-client +dbus/src/shairportsync.c +dbus/src/shairportsync.h + # Some eclipse project files .cproject .project diff --git a/dbus/sample dbus-send calls b/dbus/sample dbus-send calls index 7732d803..e7681926 100644 --- a/dbus/sample dbus-send calls +++ b/dbus/sample dbus-send calls @@ -1,42 +1,22 @@ +#Enable the loudness filter (multiline) dbus-send --system --print-reply --dest=org.gnome.ShairportSync /org/gnome/ShairportSync \ org.freedesktop.DBus.Properties.Set string:"org.gnome.ShairportSync" \ string:"LoudnessFilterActive" variant:boolean:true - +#Here it is in action: mike@ubuntu:~/sps$ dbus-send --system --print-reply --dest=org.gnome.ShairportSync /org/gnome/ShairportSync \ > org.freedesktop.DBus.Properties.Set string:"org.gnome.ShairportSync" \ > string:"LoudnessFilterActive" variant:boolean:true method return time=1505039217.715753 sender=:1.87 -> destination=:1.91 serial=27 reply_serial=2 + +#Set the Loudness Threshold: mike@ubuntu:~/sps$ dbus-send --system --print-reply --dest=org.gnome.ShairportSync /org/gnome/ShairportSync org.freedesktop.DBus.Properties.Set string:"org.gnome.ShairportSync" string:"LoudnessThreshold" variant:double:-10.0 method return time=1505039378.650185 sender=:1.87 -> destination=:1.92 serial=61 reply_serial=2 + +#Set the Volume: mike@ubuntu:~/sps$ dbus-send --system --print-reply --dest=org.gnome.ShairportSync /org/gnome/ShairportSync org.freedesktop.DBus.Properties.Set string:"org.gnome.ShairportSync" string:"Volume" variant:double:-13.5 method return time=1505039453.757603 sender=:1.87 -> destination=:1.93 serial=73 reply_serial=2 -mike@ubuntu:~/sps$ dbus-send --system --print-reply --dest=org.gnome.ShairportSync /org/gnome/ShairportSync org.freedesktop.DBus.Properties.Set string:"org.gnome.ShairportSync" string:"Volume" variant:double:-13.5 -method return time=1505039476.152207 sender=:1.87 -> destination=:1.94 serial=75 reply_serial=2 -mike@ubuntu:~/sps$ dbus-send --system --print-reply --dest=org.gnome.ShairportSync /org/gnome/ShairportSync org.freedesktop.DBus.Properties.Set string:"org.gnome.ShairportSync" string:"Volume" variant:double:-10.0 -method return time=1505039495.549155 sender=:1.87 -> destination=:1.95 serial=76 reply_serial=2 -mike@ubuntu:~/sps$ dbus-send --system --print-reply --dest=org.gnome.ShairportSync /org/gnome/ShairportSync org.freedesktop.DBus.Properties.Set string:"org.gnome.ShairportSync" string:"Volume" variant:double:-10.0 -method return time=1505039508.765168 sender=:1.87 -> destination=:1.96 serial=78 reply_serial=2 -mike@ubuntu:~/sps$ dbus-send --system --print-reply --dest=org.gnome.ShairportSync /org/gnome/ShairportSync org.freedesktop.DBus.Properties.Set string:"org.gnome.ShairportSync" string:"Volume" variant:double:-6 -method return time=1505039515.416719 sender=:1.87 -> destination=:1.97 serial=79 reply_serial=2 -mike@ubuntu:~/sps$ dbus-send --system --print-reply --dest=org.gnome.ShairportSync /org/gnome/ShairportSync org.freedesktop.DBus.Properties.Set string:"org.gnome.ShairportSync" string:"Volume" variant:double:-10 -method return time=1505039537.148590 sender=:1.87 -> destination=:1.98 serial=81 reply_serial=2 -mike@ubuntu:~/sps$ dbus-send --system --print-reply --dest=org.gnome.ShairportSync /org/gnome/ShairportSync org.freedesktop.DBus.Properties.Set string:"org.gnome.ShairportSync" string:"Volume" variant:double:0 -method return time=1505039553.095614 sender=:1.87 -> destination=:1.99 serial=83 reply_serial=2 -mike@ubuntu:~/sps$ dbus-send --system --print-reply --dest=org.gnome.ShairportSync /org/gnome/ShairportSync org.freedesktop.DBus.Properties.Set string:"org.gnome.ShairportSync" string:"Volume" variant:double:-30 -method return time=1505039569.235297 sender=:1.87 -> destination=:1.100 serial=85 reply_serial=2 -mike@ubuntu:~/sps$ dbus-send --system --print-reply --dest=org.gnome.ShairportSync /org/gnome/ShairportSync org.freedesktop.DBus.Properties.Set string:"org.gnome.ShairportSync" string:"Volume" variant:double:-29 -method return time=1505039585.083032 sender=:1.87 -> destination=:1.101 serial=87 reply_serial=2 -mike@ubuntu:~/sps$ dbus-send --system --print-reply --dest=org.gnome.ShairportSync /org/gnome/ShairportSync org.freedesktop.DBus.Properties.Set string:"org.gnome.ShairportSync" string:"Volume" variant:double:-20 -method return time=1505039591.981307 sender=:1.87 -> destination=:1.102 serial=89 reply_serial=2 -mike@ubuntu:~/sps$ dbus-send --system --print-reply --dest=org.gnome.ShairportSync /org/gnome/ShairportSync org.freedesktop.DBus.Properties.Set string:"org.gnome.ShairportSync" string:"Volume" variant:double:-15 -method return time=1505039605.035592 sender=:1.87 -> destination=:1.103 serial=91 reply_serial=2 -mike@ubuntu:~/sps$ dbus-send --system --print-reply --dest=org.gnome.ShairportSync /org/gnome/ShairportSync org.freedesktop.DBus.Properties.Set string:"org.gnome.ShairportSync" string:"Volume" variant:double:-144 -method return time=1505039689.227557 sender=:1.87 -> destination=:1.104 serial=93 reply_serial=2 -mike@ubuntu:~/sps$ dbus-send --system --print-reply --dest=org.gnome.ShairportSync /org/gnome/ShairportSync org.freedesktop.DBus.Properties.Set string:"org.gnome.ShairportSync" string:"Volume" variant:double:-143 -method return time=1505039702.614409 sender=:1.87 -> destination=:1.105 serial=95 reply_serial=2 -mike@ubuntu:~/sps$ dbus-send --system --print-reply --dest=org.gnome.ShairportSync /org/gnome/ShairportSync org.freedesktop.DBus.Properties.Set string:"org.gnome.ShairportSync" string:"Volume" variant:double:-10 -method return time=1505039728.154118 sender=:1.87 -> destination=:1.106 serial=97 reply_serial=2 + diff --git a/dbus/src/dbus_service.c b/dbus/src/dbus_service.c index 029a5c5a..440c72fa 100644 --- a/dbus/src/dbus_service.c +++ b/dbus/src/dbus_service.c @@ -9,7 +9,7 @@ #include "dbus_service.h" void notify_loudness_filter_active_callback(ShairportSync *skeleton, gpointer user_data) { - debug(1,"\"notify_loudness_filter_active_callback\" called with a gpointer of %lx.",(int64_t)user_data); + debug(1,"\"notify_loudness_filter_active_callback\" called."); if (shairport_sync_get_loudness_filter_active (skeleton)) { debug(1,"activating loudness filter"); config.loudness = 1;