diff options
-rw-r--r-- | debian/changelog | 57 | ||||
-rw-r--r-- | debian/control | 2 | ||||
-rw-r--r-- | src/common-defs.h | 93 |
3 files changed, 58 insertions, 94 deletions
diff --git a/debian/changelog b/debian/changelog index 17ee3af..40d8cc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,60 @@ +indicator-sound (12.10.2daily13.06.07-0ubuntu1) saucy; urgency=low + + [ Jeremy Bicha ] + * debian/control: + - Build with valac (>= 0.18) instead of vala-0.18 for easier transitions + + [ Ubuntu daily release ] + * Automatic snapshot from revision 351 + + -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 07 Jun 2013 02:02:47 +0000 + +indicator-sound (12.10.2daily13.05.02-0ubuntu1) saucy; urgency=low + + * Automatic snapshot from revision 349 + + -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 02 May 2013 22:59:34 +0000 + +indicator-sound (12.10.2daily13.04.12-0ubuntu1) raring; urgency=low + + [ Marco Trevisan (Treviño) ] + * Indicator-sound should send the event timestamp when launching a + player (LP: #1163434) + * Player controls are non-functional in all mpris2 supported players + (LP: #1167908) + * Window management - Apps raised from indicators sometimes dont have + the focus (LP: #627195) + + [ Ubuntu daily release ] + * Automatic snapshot from revision 348 + + -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 12 Apr 2013 02:03:33 +0000 + +indicator-sound (12.10.2daily13.04.09-0ubuntu1) raring; urgency=low + + * Automatic snapshot from revision 348 + + -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 09 Apr 2013 02:02:50 +0000 + +indicator-sound (12.10.2daily13.04.08-0ubuntu1) raring; urgency=low + + [ Marco Trevisan (Treviño) ] + * Indicator-sound should send the event timestamp when launching a + player (LP: #1163434) + * Window management - Apps raised from indicators sometimes dont have + the focus (LP: #627195) + + [ Ubuntu daily release ] + * Automatic snapshot from revision 347 + + -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 08 Apr 2013 02:03:24 +0000 + +indicator-sound (12.10.2daily13.03.07-0ubuntu1) raring; urgency=low + + * Automatic snapshot from revision 343 + + -- Automatic PS uploader <ps-jenkins@lists.canonical.com> Thu, 07 Mar 2013 02:01:27 +0000 + indicator-sound (12.10.2daily13.02.25-0ubuntu1) raring; urgency=low [ Lars Uebernickel ] diff --git a/debian/control b/debian/control index 338d253..ee5e310 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9.0), quilt, gnome-common, autotools-dev, - valac-0.18, + valac (>= 0.18), libglib2.0-dev (>= 2.22.3), libpulse-dev (>= 0.9.18), libpulse-mainloop-glib0 (>= 0.9.18), diff --git a/src/common-defs.h b/src/common-defs.h deleted file mode 100644 index a20fb03..0000000 --- a/src/common-defs.h +++ /dev/null @@ -1,93 +0,0 @@ -/* -Copyright 2010 Canonical Ltd. - -Authors: - Conor Curran <conor.curran@canonical.com> - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License version 3, as published -by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranties of -MERCHANTABILITY, SATISFACTORY QUALITY, 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/>. -*/ -#ifndef __COMMON_DEFS_H__ -#define __COMMON_DEFS_H__ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -typedef enum { - MUTED, - ZERO_LEVEL, - LOW_LEVEL, - MEDIUM_LEVEL, - HIGH_LEVEL, - BLOCKED, - UNAVAILABLE, - AVAILABLE -}SoundState; - -typedef enum { - TRANSPORT_ACTION_PREVIOUS, - TRANSPORT_ACTION_PLAY_PAUSE, - TRANSPORT_ACTION_NEXT, - TRANSPORT_ACTION_REWIND, - TRANSPORT_ACTION_FORWIND, - TRANSPORT_ACTION_NO_ACTION -}TransportAction; - -typedef enum { - TRANSPORT_STATE_PLAYING, - TRANSPORT_STATE_PAUSED, - TRANSPORT_STATE_LAUNCHING -}TransportState; - -#define NOT_ACTIVE -1 -#define DBUSMENU_PROPERTY_EMPTY -1 - -/* DBUS Custom Items */ -#define DBUSMENU_VOLUME_MENUITEM_TYPE "x-canonical-ido-volume-type" -#define DBUSMENU_VOLUME_MENUITEM_LEVEL "x-canonical-ido-volume-level" -#define DBUSMENU_VOLUME_MENUITEM_MUTE "x-canonical-ido-volume-mute" - -#define DBUSMENU_VOIP_INPUT_MENUITEM_TYPE "x-canonical-ido-voip-input-type" -#define DBUSMENU_VOIP_INPUT_MENUITEM_LEVEL "x-canonical-ido-voip-input-level" -#define DBUSMENU_VOIP_INPUT_MENUITEM_MUTE "x-canonical-ido-voip-input-mute" - -#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" - -#define DBUSMENU_TRACK_SPECIFIC_MENUITEM_TYPE "x-canonical-sound-menu-player-track-specific-type" - -#define DBUSMENU_METADATA_MENUITEM_TYPE "x-canonical-sound-menu-player-metadata-type" -#define DBUSMENU_METADATA_MENUITEM_ARTIST "x-canonical-sound-menu-player-metadata-xesam:artist" -#define DBUSMENU_METADATA_MENUITEM_TITLE "x-canonical-sound-menu-player-metadata-xesam:title" -#define DBUSMENU_METADATA_MENUITEM_ALBUM "x-canonical-sound-menu-player-metadata-xesam:album" -#define DBUSMENU_METADATA_MENUITEM_ARTURL "x-canonical-sound-menu-player-metadata-mpris:artUrl" -#define DBUSMENU_METADATA_MENUITEM_PLAYER_NAME "x-canonical-sound-menu-player-metadata-player-name" -#define DBUSMENU_METADATA_MENUITEM_PLAYER_ICON "x-canonical-sound-menu-player-metadata-player-icon" -#define DBUSMENU_METADATA_MENUITEM_PLAYER_RUNNING "x-canonical-sound-menu-player-metadata-player-running" -#define DBUSMENU_METADATA_MENUITEM_HIDE_TRACK_DETAILS "x-canonical-sound-menu-player-metadata-hide-track-details" - -#define DBUSMENU_SCRUB_MENUITEM_TYPE "x-canonical-sound-menu-player-scrub-type" -#define DBUSMENU_SCRUB_MENUITEM_DURATION "x-canonical-sound-menu-player-scrub-mpris:length" -#define DBUSMENU_SCRUB_MENUITEM_POSITION "x-canonical-sound-menu-player-scrub-position" -#define DBUSMENU_SCRUB_MENUITEM_PLAY_STATE "x-canonical-sound-menu-player-scrub-play-state" - -#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" - -#define DBUSMENU_PLAYLIST_MENUITEM_PATH "x-canonical-sound-menu-player-playlist-path" - -#endif |