From 5f1d857f263edd696fe1d9af793a26e9bbd5a6c3 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Wed, 12 Jan 2011 12:44:27 -0600 Subject: moving towards an encapsulated mute --- src/common-defs.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/common-defs.h') diff --git a/src/common-defs.h b/src/common-defs.h index 8ec69e8..c7d497a 100644 --- a/src/common-defs.h +++ b/src/common-defs.h @@ -30,6 +30,9 @@ with this program. If not, see . #define DBUSMENU_VOLUME_MENUITEM_TYPE "x-canonical-ido-volume-type" #define DBUSMENU_VOLUME_MENUITEM_LEVEL "x-canonical-ido-volume-level" +#define DBUSMENU_MUTE_MENUITEM_TYPE "x-canonical-sound-menu-mute-type" +#define DBUSMENU_MUTE_MENUITEM_VALUE "x-canonical-sound-menu-mute-value" + #define DBUSMENU_TRANSPORT_MENUITEM_TYPE "x-canonical-sound-menu-player-transport-type" #define DBUSMENU_TRANSPORT_MENUITEM_PLAY_STATE "x-canonical-sound-menu-player-transport-state" -- cgit v1.2.3 From 5f6cebbcfffa32bffada62659e750ab7d362802e Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Sat, 22 Jan 2011 22:15:44 -0600 Subject: service signals and methods re worked plus removed dbus-menu-manager.c and h and moved what was needed into the sound-service-dbus --- src/common-defs.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src/common-defs.h') diff --git a/src/common-defs.h b/src/common-defs.h index c7d497a..5b5c418 100644 --- a/src/common-defs.h +++ b/src/common-defs.h @@ -24,6 +24,18 @@ with this program. If not, see . #define SIGNAL_SINK_MUTE_UPDATE "SinkMuteUpdate" #define SIGNAL_SINK_AVAILABLE_UPDATE "SinkAvailableUpdate" +typedef enum { + MUTED, + ZERO_LEVEL, + LOW_LEVEL, + MEDIUM_LEVEL, + HIGH_LEVEL, + BLOCKED, + UNAVAILABLE, + AVAILABLE +}SoundState; + + #define DBUSMENU_PROPERTY_EMPTY -1 /* DBUS Custom Items */ @@ -54,4 +66,4 @@ with this program. If not, see . #define DBUSMENU_PLAYLISTS_MENUITEM_TYPE "x-canonical-sound-menu-player-playlists-type" #define DBUSMENU_PLAYLISTS_MENUITEM_TITLE "x-canonical-sound-menu-player-playlists-title" -#define DBUSMENU_PLAYLISTS_MENUITEM_PLAYLISTS "x-canonical-sound-menu-player-playlists-playlists" \ No newline at end of file +#define DBUSMENU_PLAYLISTS_MENUITEM_PLAYLISTS "x-canonical-sound-menu-player-playlists-playlists" -- cgit v1.2.3 From 1ccf02c850145706776fd2c79a30a33a02df50b3 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Sat, 22 Jan 2011 23:37:45 -0600 Subject: signals and methods cut down to size, next the indicator --- src/common-defs.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/common-defs.h') diff --git a/src/common-defs.h b/src/common-defs.h index 5b5c418..3e6b004 100644 --- a/src/common-defs.h +++ b/src/common-defs.h @@ -16,14 +16,10 @@ 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 . */ +#ifndef __COMMON_DEFS_H__ +#define __COMMON_DEFS_H__ -/* constants used for signals on the dbus. This file is shared between client and server implementation */ -#define SIGNAL_SINK_INPUT_WHILE_MUTED "SinkInputWhileMuted" -#define SIGNAL_SINK_VOLUME_UPDATE "SinkVolumeUpdate" -#define SIGNAL_SINK_MUTE_UPDATE "SinkMuteUpdate" -#define SIGNAL_SINK_AVAILABLE_UPDATE "SinkAvailableUpdate" - typedef enum { MUTED, ZERO_LEVEL, @@ -67,3 +63,5 @@ typedef enum { #define DBUSMENU_PLAYLISTS_MENUITEM_TYPE "x-canonical-sound-menu-player-playlists-type" #define DBUSMENU_PLAYLISTS_MENUITEM_TITLE "x-canonical-sound-menu-player-playlists-title" #define DBUSMENU_PLAYLISTS_MENUITEM_PLAYLISTS "x-canonical-sound-menu-player-playlists-playlists" + +#endif -- cgit v1.2.3 From 49df0fb3ea29693bdb8decf51f4da055c8e1a7cb Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Mon, 24 Jan 2011 16:26:21 -0600 Subject: indicator side almost up and going --- src/common-defs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/common-defs.h') diff --git a/src/common-defs.h b/src/common-defs.h index 3e6b004..5458dc5 100644 --- a/src/common-defs.h +++ b/src/common-defs.h @@ -38,8 +38,8 @@ typedef enum { #define DBUSMENU_VOLUME_MENUITEM_TYPE "x-canonical-ido-volume-type" #define DBUSMENU_VOLUME_MENUITEM_LEVEL "x-canonical-ido-volume-level" -#define DBUSMENU_MUTE_MENUITEM_TYPE "x-canonical-sound-menu-mute-type" -#define DBUSMENU_MUTE_MENUITEM_VALUE "x-canonical-sound-menu-mute-value" +#define DBUSMENU_MUTE_MENUITEM_TYPE "x-canonical-sound-menu-mute-type" +#define DBUSMENU_MUTE_MENUITEM_VALUE "x-canonical-sound-menu-mute-value" #define DBUSMENU_TRANSPORT_MENUITEM_TYPE "x-canonical-sound-menu-player-transport-type" #define DBUSMENU_TRANSPORT_MENUITEM_PLAY_STATE "x-canonical-sound-menu-player-transport-state" -- cgit v1.2.3