From b00962daf23fe43c7409dbcc735b19d7f74e7241 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 21 Feb 2014 15:39:32 -0600 Subject: Split out the sound settings interface --- src/CMakeLists.txt | 4 ++++ src/accounts-service-sound-settings.vala | 33 ++++++++++++++++++++++++++++++++ src/accounts-service-user.vala | 14 -------------- 3 files changed, 37 insertions(+), 14 deletions(-) create mode 100644 src/accounts-service-sound-settings.vala (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7d58afb..280e89a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -83,6 +83,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 . + * + * Authors: + * Ted Gould + */ + +[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 */ -[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; -- cgit v1.2.3