aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2014-02-21 16:00:22 -0600
committerTed Gould <ted@gould.cx>2014-02-21 16:00:22 -0600
commit3f8eddfacbe2a486037c4cfe14bfc2e8228779f2 (patch)
treed1723a963ae8c8d27314894231a9ad7865d7e4d4
parentd89688f426996bbfccdab0713bbe47f09c14483b (diff)
parentb00962daf23fe43c7409dbcc735b19d7f74e7241 (diff)
downloadayatana-indicator-sound-3f8eddfacbe2a486037c4cfe14bfc2e8228779f2.tar.gz
ayatana-indicator-sound-3f8eddfacbe2a486037c4cfe14bfc2e8228779f2.tar.bz2
ayatana-indicator-sound-3f8eddfacbe2a486037c4cfe14bfc2e8228779f2.zip
Grab split out sound settings
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/accounts-service-sound-settings.vala33
-rw-r--r--src/accounts-service-user.vala14
3 files changed, 37 insertions, 14 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e80da32..ac6437c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -100,6 +100,10 @@ vala_add(indicator-sound-service
DEPENDS
media-player
mpris2-interfaces
+ accounts-service-sound-settings
+)
+vala_add(indicator-sound-service
+ accounts-service-sound-settings.vala
)
vala_finish(indicator-sound-service
diff --git a/src/accounts-service-sound-settings.vala b/src/accounts-service-sound-settings.vala
new file mode 100644
index 0000000..7e27bd5
--- /dev/null
+++ b/src/accounts-service-sound-settings.vala
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2014 © Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Ted Gould <ted@canonical.com>
+ */
+
+[DBus (name = "com.canonical.indicator.sound.AccountsService")]
+public interface AccountsServiceSoundSettings : Object {
+ // properties
+ public abstract uint64 timestamp {owned get; set;}
+ public abstract string player_name {owned get; set;}
+ public abstract Variant player_icon {owned get; set;}
+ public abstract bool running {owned get; set;}
+ public abstract string state {owned get; set;}
+ public abstract string title {owned get; set;}
+ public abstract string artist {owned get; set;}
+ public abstract string album {owned get; set;}
+ public abstract string art_url {owned get; set;}
+}
+
diff --git a/src/accounts-service-user.vala b/src/accounts-service-user.vala
index 47189a5..03aeb25 100644
--- a/src/accounts-service-user.vala
+++ b/src/accounts-service-user.vala
@@ -17,20 +17,6 @@
* Ted Gould <ted@canonical.com>
*/
-[DBus (name = "com.canonical.indicator.sound.AccountsService")]
-public interface AccountsServiceSoundSettings : Object {
- // properties
- public abstract uint64 timestamp {owned get; set;}
- public abstract string player_name {owned get; set;}
- public abstract Variant player_icon {owned get; set;}
- public abstract bool running {owned get; set;}
- public abstract string state {owned get; set;}
- public abstract string title {owned get; set;}
- public abstract string artist {owned get; set;}
- public abstract string album {owned get; set;}
- public abstract string art_url {owned get; set;}
-}
-
public class AccountsServiceUser : Object {
Act.UserManager accounts_manager = Act.UserManager.get_default();
Act.User? user = null;