From ea30986e03e54ee650a1cca610904de9f4d0f745 Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Wed, 6 Mar 2013 22:40:55 -0500
Subject: Remove libsoundmenu (panel plugin)

Indicator panel plugins are deprecated.
---
 src/Makefile.am | 38 --------------------------------------
 1 file changed, 38 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 5a36822..a56f82a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,43 +1,5 @@
 libexec_PROGRAMS = indicator-sound-service
 
-###################
-# Indicator Stuff
-###################
-
-soundmenulibdir = $(INDICATORDIR)
-soundmenulib_LTLIBRARIES = libsoundmenu.la
-libsoundmenu_la_SOURCES = \
-            common-defs.h \
-            indicator-sound.h \
-            indicator-sound.c \
-            sound-state.c \
-            sound-state.h \
-            sound-state-manager.c \
-            sound-state-manager.h \
-            transport-widget.c \
-            transport-widget.h \
-            metadata-widget.c \
-            metadata-widget.h \
-            mute-widget.c \
-            mute-widget.h \
-            volume-widget.c \
-            volume-widget.h \
-            voip-input-widget.c \
-            voip-input-widget.h \
-            gen-sound-service.xml.h \
-            gen-sound-service.xml.c \
-            dbus-shared-names.h
-
-libsoundmenu_la_CFLAGS = \
-	$(APPLET_CFLAGS) \
-	$(COVERAGE_CFLAGS) \
-	-Wall -Werror -DG_LOG_DOMAIN=\"Indicator-Sound\"
-libsoundmenu_la_LIBADD = $(APPLET_LIBS) -lm
-libsoundmenu_la_LDFLAGS = \ 
-	$(COVERAGE_LDFLAGS) \
-	-module -avoid-version
-
-
 checkxml: $(srcdir)/sound-service.xml
 	@xmllint -valid -noout $<
 	@echo $< checks out ok
-- 
cgit v1.2.3


From 92c98f341c6b5600d4b5fae8753326c866e40860 Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Fri, 22 Mar 2013 16:24:06 -0400
Subject: Add service that adheres to the new indicator protocol

This is the one that gets built now.  It doesn't do anything interesting yet,
though.
---
 src/Makefile.am | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index a56f82a..39ec6bf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,6 +17,8 @@ glib_marshal_prefix = _sound_service_marshal
 # Sound service vala
 #####################
 music_bridge_VALASOURCES = \
+	service.vala \
+	main.vala \
 	music-player-bridge.vala \
 	transport-menu-item.vala \
 	specific-items-manager.vala \
@@ -44,7 +46,9 @@ music_bridge_VALAFLAGS = \
   --pkg gio-2.0 \
   --pkg gio-unix-2.0 \
   --pkg gdk-pixbuf-2.0 \
-  --pkg libxml-2.0
+  --pkg libxml-2.0 \
+  --pkg libpulse \
+  --target-glib=2.36
 
  $(MAINTAINER_VALAFLAGS)
 
@@ -60,8 +64,6 @@ music_bridge_vala.stamp $(music_bridge_APIFILES): $(music_bridge_VALASOURCES)
 ###############################
 indicator_sound_service_SOURCES = \
   common-defs.h \
-  sound-service.h \
-  sound-service.c \
   sound-state.c \
   sound-state.h \
   pulseaudio-mgr.h \
-- 
cgit v1.2.3


From c3d504bc66bbd360ca6c8d5742a121441dacbfe2 Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Wed, 27 Mar 2013 13:06:26 -0400
Subject: Add VolumeControl and hook up mute and volume actions to it

The VolumeControl class originated in the phablet branch of this indicator.
---
 src/Makefile.am | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 39ec6bf..2421683 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,6 +19,7 @@ glib_marshal_prefix = _sound_service_marshal
 music_bridge_VALASOURCES = \
 	service.vala \
 	main.vala \
+	volume-control.vala \
 	music-player-bridge.vala \
 	transport-menu-item.vala \
 	specific-items-manager.vala \
@@ -48,6 +49,8 @@ music_bridge_VALAFLAGS = \
   --pkg gdk-pixbuf-2.0 \
   --pkg libxml-2.0 \
   --pkg libpulse \
+  --pkg libpulse-mainloop-glib \
+  --pkg pulseaudio-mgr \
   --target-glib=2.36
 
  $(MAINTAINER_VALAFLAGS)
-- 
cgit v1.2.3


From 1419ef39b81be9d8a42b915ad9f56e81ab4eb03c Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Thu, 28 Mar 2013 12:34:35 -0400
Subject: Show running media players in the menu

Each player has its own action with a dictionary state.  Right now, this state
only contains one key "running", which signifies whether an instance of the
player is currently running.

It does not yet show non-running players on startup, and ignores the blacklist.
---
 src/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 2421683..1de360c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,6 +20,8 @@ music_bridge_VALASOURCES = \
 	service.vala \
 	main.vala \
 	volume-control.vala \
+	media-player.vala \
+	media-player-list.vala \
 	music-player-bridge.vala \
 	transport-menu-item.vala \
 	specific-items-manager.vala \
-- 
cgit v1.2.3


From 838d4366a4c5e159ef7cde4caef4d908730df3a7 Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Thu, 4 Apr 2013 05:51:55 +0200
Subject: Don't build unused files and remove superseded files

---
 src/Makefile.am | 56 +-------------------------------------------------------
 1 file changed, 1 insertion(+), 55 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 1de360c..993b0d2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,5 @@
 libexec_PROGRAMS = indicator-sound-service
 
-checkxml: $(srcdir)/sound-service.xml
-	@xmllint -valid -noout $<
-	@echo $< checks out ok
-
-
 ####################################################################
 # Sound Service 
 ####################################################################
@@ -22,19 +17,9 @@ music_bridge_VALASOURCES = \
 	volume-control.vala \
 	media-player.vala \
 	media-player-list.vala \
-	music-player-bridge.vala \
-	transport-menu-item.vala \
-	specific-items-manager.vala \
-	metadata-menu-item.vala \
-	player-controller.vala \
 	mpris2-interfaces.vala \
 	mpris2-watcher.vala \
-	mpris2-controller.vala \
-	player-item.vala \
-	settings-manager.vala \
-	playlists-menu-item.vala \
-	freedesktop-interfaces.vala \
-	fetch-file.vala  
+	freedesktop-interfaces.vala
 
 music_bridge_VALAFLAGS = \
   --ccode \
@@ -52,7 +37,6 @@ music_bridge_VALAFLAGS = \
   --pkg libxml-2.0 \
   --pkg libpulse \
   --pkg libpulse-mainloop-glib \
-  --pkg pulseaudio-mgr \
   --target-glib=2.36
 
  $(MAINTAINER_VALAFLAGS)
@@ -69,24 +53,6 @@ music_bridge_vala.stamp $(music_bridge_APIFILES): $(music_bridge_VALASOURCES)
 ###############################
 indicator_sound_service_SOURCES = \
   common-defs.h \
-  sound-state.c \
-  sound-state.h \
-  pulseaudio-mgr.h \
-  pulseaudio-mgr.c \
-  device.c \
-  device.h \
-  sound-service-dbus.h \
-  sound-service-dbus.c \
-  slider-menu-item.h \
-  slider-menu-item.c \
-  voip-input-menu-item.h \
-  voip-input-menu-item.c \
-  mute-menu-item.h \
-  mute-menu-item.c \
-  gen-sound-service.xml.h \
-  gen-sound-service.xml.c \
-  sound-service-marshal.c \
-  sound-service-marshal.h \
   $(music_bridge_VALASOURCES:.vala=.c)
 
 indicator_sound_service_CFLAGS = $(PULSEAUDIO_CFLAGS) \
@@ -97,26 +63,8 @@ indicator_sound_service_CFLAGS = $(PULSEAUDIO_CFLAGS) \
 indicator_sound_service_LDADD = $(PULSEAUDIO_LIBS) $(SOUNDSERVICE_LIBS) $(GCONF_LIBS)
 indicator_sound_service_LDFLAGS = $(COVERAGE_LDFLAGS)
 
-#########################
-# Service xml compilation
-#########################
-DBUS_SPECS = \
-  sound-service.xml
-
-gen-%.xml.h: %.xml
-	@echo "Building $@ from $<"
-	@echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<))));" > $@
-
-gen-%.xml.c: %.xml
-	@echo "Building $@ from $<"
-	@echo "const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<)))) = " > $@
-	@sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@
-	@echo ";" >> $@
-
-
 EXTRA_DIST = \
   $(DBUS_SPECS) \
-  sound-service.xml \
   $(music_bridge_APIFILES) \
   $(music_bridge_VALASOURCES)
   
@@ -126,8 +74,6 @@ EXTRA_DIST = \
 BUILT_SOURCES = \
 	music_bridge_vala.stamp \
 	$(music_bridge_APIFILES) \
-	gen-sound-service.xml.h \
-	gen-sound-service.xml.c \
 	$(music_bridge_VALASOURCES:.vala=.c)
   
 CLEANFILES = \
-- 
cgit v1.2.3


From 69fc4a3d92bbbf5940769d877650e45a9c2b913b Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Thu, 4 Apr 2013 05:57:18 +0200
Subject: Remove sound-service-marshal (not needed anymore)

---
 src/Makefile.am | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 993b0d2..afbc364 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,13 +1,5 @@
 libexec_PROGRAMS = indicator-sound-service
 
-####################################################################
-# Sound Service 
-####################################################################
-
-glib_marshal_list = sound-service-marshal.list
-glib_marshal_prefix = _sound_service_marshal
-
-
 #####################
 # Sound service vala
 #####################
@@ -80,5 +72,3 @@ CLEANFILES = \
 	$(BUILT_SOURCES)
 
 DISTCLEANFILES = 
-
-include $(top_srcdir)/Makefile.am.marshal
-- 
cgit v1.2.3


From 77e3a0bb0453f7be6d98a068345ef4484ebf7792 Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Thu, 4 Apr 2013 06:11:15 +0200
Subject: Modernize vala compiling in Makefile.am

This fixes parallel builds.
---
 src/Makefile.am | 43 +++----------------------------------------
 1 file changed, 3 insertions(+), 40 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index afbc364..083c5c2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,7 @@
 libexec_PROGRAMS = indicator-sound-service
 
-#####################
-# Sound service vala
-#####################
-music_bridge_VALASOURCES = \
+indicator_sound_service_SOURCES = \
+	common-defs.h \
 	service.vala \
 	main.vala \
 	volume-control.vala \
@@ -13,9 +11,8 @@ music_bridge_VALASOURCES = \
 	mpris2-watcher.vala \
 	freedesktop-interfaces.vala
 
-music_bridge_VALAFLAGS = \
+indicator_sound_service_VALAFLAGS = \
   --ccode \
-  -H music-player-bridge.h -d . \
   --vapidir=$(top_srcdir)/vapi/ \
   --vapidir=./ \
   --thread \
@@ -31,22 +28,6 @@ music_bridge_VALAFLAGS = \
   --pkg libpulse-mainloop-glib \
   --target-glib=2.36
 
- $(MAINTAINER_VALAFLAGS)
-
-music_bridge_APIFILES = \
-  music-player-bridge.h 
-
-music_bridge_vala.stamp $(music_bridge_APIFILES): $(music_bridge_VALASOURCES)
-	$(AM_V_GEN) $(VALAC) $(music_bridge_VALAFLAGS) $^
-	touch music_bridge_vala.stamp
-
-###############################
-# Sound Service C
-###############################
-indicator_sound_service_SOURCES = \
-  common-defs.h \
-  $(music_bridge_VALASOURCES:.vala=.c)
-
 indicator_sound_service_CFLAGS = $(PULSEAUDIO_CFLAGS) \
 	$(SOUNDSERVICE_CFLAGS) \
 	$(GCONF_CFLAGS) \
@@ -54,21 +35,3 @@ indicator_sound_service_CFLAGS = $(PULSEAUDIO_CFLAGS) \
 	-DLIBEXECDIR=\"$(libexecdir)\" -Wall
 indicator_sound_service_LDADD = $(PULSEAUDIO_LIBS) $(SOUNDSERVICE_LIBS) $(GCONF_LIBS)
 indicator_sound_service_LDFLAGS = $(COVERAGE_LDFLAGS)
-
-EXTRA_DIST = \
-  $(DBUS_SPECS) \
-  $(music_bridge_APIFILES) \
-  $(music_bridge_VALASOURCES)
-  
-#######################
-# Stuff to clean Stuff
-#######################
-BUILT_SOURCES = \
-	music_bridge_vala.stamp \
-	$(music_bridge_APIFILES) \
-	$(music_bridge_VALASOURCES:.vala=.c)
-  
-CLEANFILES = \
-	$(BUILT_SOURCES)
-
-DISTCLEANFILES = 
-- 
cgit v1.2.3


From cb8cb6ef16fc0884d2499421fbeeca12e3288b56 Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Tue, 18 Jun 2013 08:03:10 -0400
Subject: Remove obsolete files (gtk and dbusmenu)

---
 src/Makefile.am | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 083c5c2..84ee0f1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,6 @@
 libexec_PROGRAMS = indicator-sound-service
 
 indicator_sound_service_SOURCES = \
-	common-defs.h \
 	service.vala \
 	main.vala \
 	volume-control.vala \
@@ -16,13 +15,9 @@ indicator_sound_service_VALAFLAGS = \
   --vapidir=$(top_srcdir)/vapi/ \
   --vapidir=./ \
   --thread \
-  --pkg gee-1.0 \
-  --pkg Dbusmenu-0.4 \
-  --pkg common-defs \
   --pkg config \
   --pkg gio-2.0 \
   --pkg gio-unix-2.0 \
-  --pkg gdk-pixbuf-2.0 \
   --pkg libxml-2.0 \
   --pkg libpulse \
   --pkg libpulse-mainloop-glib \
-- 
cgit v1.2.3


From 6c65b1d8e63ab351ea4da525ecdfc5226161bfc6 Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Wed, 19 Jun 2013 12:06:21 -0400
Subject: Mark translatable strings as translatable

---
 src/Makefile.am | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 84ee0f1..15a5cbf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,6 +27,8 @@ indicator_sound_service_CFLAGS = $(PULSEAUDIO_CFLAGS) \
 	$(SOUNDSERVICE_CFLAGS) \
 	$(GCONF_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
-	-DLIBEXECDIR=\"$(libexecdir)\" -Wall
+	-DLIBEXECDIR=\"$(libexecdir)\" -Wall \
+	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"
+
 indicator_sound_service_LDADD = $(PULSEAUDIO_LIBS) $(SOUNDSERVICE_LIBS) $(GCONF_LIBS)
 indicator_sound_service_LDFLAGS = $(COVERAGE_LDFLAGS)
-- 
cgit v1.2.3


From a0773c53b13546f4957f2b2ac1f0455fedc05525 Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Wed, 19 Jun 2013 15:29:12 -0400
Subject: Disable warnings for vala-generated C code

---
 src/Makefile.am | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 15a5cbf..5958b51 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,11 +23,13 @@ indicator_sound_service_VALAFLAGS = \
   --pkg libpulse-mainloop-glib \
   --target-glib=2.36
 
+# -w to disable warnings for vala-generated code
 indicator_sound_service_CFLAGS = $(PULSEAUDIO_CFLAGS) \
 	$(SOUNDSERVICE_CFLAGS) \
 	$(GCONF_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
-	-DLIBEXECDIR=\"$(libexecdir)\" -Wall \
+	-DLIBEXECDIR=\"$(libexecdir)\" \
+	-w \
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"
 
 indicator_sound_service_LDADD = $(PULSEAUDIO_LIBS) $(SOUNDSERVICE_LIBS) $(GCONF_LIBS)
-- 
cgit v1.2.3


From 7ca667494e32d110766c2b4a013b6a2c37b8a084 Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Thu, 4 Jul 2013 16:09:09 -0400
Subject: Put service into $pkglibexecdir

---
 src/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 5958b51..da3df5b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-libexec_PROGRAMS = indicator-sound-service
+pkglibexec_PROGRAMS = indicator-sound-service
 
 indicator_sound_service_SOURCES = \
 	service.vala \
-- 
cgit v1.2.3