mix and match vala and c

2 files changed, 82 insertions, 39 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index f472662..7a747a3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,11 +7,11 @@ libexec_PROGRAMS = indicator-sound-service
 soundmenulibdir = $(INDICATORDIR)
 soundmenulib_LTLIBRARIES = libsoundmenu.la
 libsoundmenu_la_SOURCES = \
-    common-defs.h \
+  common-defs.h \
 	indicator-sound.h \
 	indicator-sound.c \
 	dbus-shared-names.h \
-    sound-service-client.h 
+  sound-service-client.h 
 
 libsoundmenu_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror -DG_LOG_DOMAIN=\"Indicator-Sound\"
 libsoundmenu_la_LIBADD = $(APPLET_LIBS)
@@ -29,25 +29,13 @@ sound-service-client.h: $(srcdir)/sound-service.xml
 		$(srcdir)/sound-service.xml
 
 
+####################################################################
+# Sound Service 
+####################################################################
+
 #################
-# Session Stuff
+# dbus interface
 #################
-indicator_sound_service_SOURCES = \
-    common-defs.h \
-    sound-service.h \
-    sound-service.c \
-    dbus-menu-manager.c \
-    dbus-menu-manager.h \
-    pulse-manager.h \
-    pulse-manager.c \
-    sound-service-dbus.h \
-    sound-service-dbus.c \
-    sound-service-server.h \
-    slider-menu-item.h \
-    slider-menu-item.c
-indicator_sound_service_CFLAGS = $(PULSEAUDIO_CFLAGS) $(SOUNDSERVICE_CFLAGS) $(GCONF_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" -Wall -Werror
-indicator_sound_service_LDADD = $(PULSEAUDIO_LIBS) $(SOUNDSERVICE_LIBS) $(GCONF_LIBS)
-
 sound-service-server.h: $(srcdir)/sound-service.xml
 	dbus-binding-tool \
 		--prefix=_sound_service_server \
@@ -55,21 +43,72 @@ sound-service-server.h: $(srcdir)/sound-service.xml
 		--output=sound-service-server.h \
 		$(srcdir)/sound-service.xml
 
-###############
-# Other Stuff
-###############
-BUILT_SOURCES = \
-	sound-service-client.h \
-    sound-service-server.h 
+#####################
+# libsoundmenu vala
+#####################
+music_bridge_VALASOURCES = \
+	music-bridge.vala
+
+music_bridge_VALAFLAGS = \
+  --ccode \
+  -H music-bridge.h -d . \
+  --library music-bridge \
+  --vapidir=./ \
+  --vapidir=$(abs_top_builddir)/vapi/ \
+  --thread \
+  --pkg gee-1.0 \
+  --pkg indicate \
+  --pkg DbusmenuGlib-0.2 \
+  $(MAINTAINER_VALAFLAGS)
+
+music_bridge_APIFILES = \
+  music-bridge.h
+
+
+music_bridge_vala.stamp $(music_bridge_APIFILES): $(music_bridge_VALASOURCES)
+	$(AM_V_GEN) $(VALAC) $(music_bridge_VALAFLAGS) $^
+	touch music_bridge_vala.stamp
+
+###############################
+# libsoundmenu C
+###############################
+indicator_sound_service_SOURCES = \
+	common-defs.h \
+  sound-service.h \
+  sound-service.c \
+  dbus-menu-manager.c \
+  dbus-menu-manager.h \
+  pulse-manager.h \
+  pulse-manager.c \
+  sound-service-dbus.h \
+  sound-service-dbus.c \
+  sound-service-server.h \
+  slider-menu-item.h \
+  slider-menu-item.c \
+  $(music_bridge_VALASOURCES:.vala=.c)
 
+indicator_sound_service_CFLAGS = $(PULSEAUDIO_CFLAGS) $(SOUNDSERVICE_CFLAGS) $(GCONF_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" -Wall -Werror
+indicator_sound_service_LDADD = $(PULSEAUDIO_LIBS) $(SOUNDSERVICE_LIBS) $(GCONF_LIBS)
+
+#########################
+# Extra stuff to package
+#########################
 EXTRA_DIST = \
-    sound-service.xml \
-    sound-service.list
+  sound-service.xml \
+  sound-service.list \
+  $(music_bridge_la_APIFILES) \
+  $(music_bridge_la_VALASOURCES)
+
+#######################
+# Stuff to clean Stuff
+#######################
+BUILT_SOURCES = \
+	music_bridge_vala.stamp \
+	sound-service-client.h \
+  sound-service-server.h \
+  $(music_bridge_la_APIFILES) \
+  $(music_bridge_la_VALASOURCES:.vala=.c) 
 
 CLEANFILES = \
 	$(BUILT_SOURCES)
 
-
-
-
-
diff --git a/src/sound-service.c b/src/sound-service.c
index d70971e..a061e86 100644
--- a/src/sound-service.c
+++ b/src/sound-service.c
@@ -23,6 +23,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "sound-service.h"
 #include "dbus-menu-manager.h"
 #include "pulse-manager.h"
+#include "music-bridge.h"
 
 static GMainLoop *mainloop = NULL;
 
@@ -44,8 +45,8 @@ service_shutdown (IndicatorService *service, gpointer user_data)
 	if (mainloop != NULL) {
 		g_debug("Service shutdown !");
         // TODO: uncomment for release !!
-       	close_pulse_activites();
-        g_main_loop_quit(mainloop);
+/*       	close_pulse_activites();*/
+/*        g_main_loop_quit(mainloop);*/
 	}
 	return;
 }
@@ -57,7 +58,7 @@ main:
 int
 main (int argc, char ** argv)
 {
-    g_type_init();
+  g_type_init();
 
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
@@ -69,13 +70,16 @@ main (int argc, char ** argv)
 	                 INDICATOR_SERVICE_SIGNAL_SHUTDOWN,
 	                 G_CALLBACK(service_shutdown), NULL);    
 
-    dbus_menu_manager_setup();
+  dbus_menu_manager_setup();
+	BridgeServer* server = bridge_server_new();	
+	bridge_server_test_me(server);
+	//g_object_new(bridge_server_new, NULL);	
 
     // Run the loop
-    mainloop = g_main_loop_new(NULL, FALSE);
-    g_main_loop_run(mainloop);
-
-    return 0;
+  mainloop = g_main_loop_new(NULL, FALSE);
+  g_main_loop_run(mainloop);
+	
+  return 0;
 }