[Pommed-commits] r393 - in trunk: . wmpomme

[jblache at alioth.debian.org]

Author: jblache
Date: 2007-11-27 16:38:21 +0000 (Tue, 27 Nov 2007)
New Revision: 393

Modified:
   trunk/ChangeLog
   trunk/wmpomme/Makefile
   trunk/wmpomme/wmpomme.c
Log:
Add video switch support to wmpomme.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-11-27 16:36:02 UTC (rev 392)
+++ trunk/ChangeLog	2007-11-27 16:38:21 UTC (rev 393)
@@ -4,6 +4,7 @@
 version 1.13:
 	- pommed: add an option to disable the beep on volume change.
 	- pommed: add the videoSwitch DBus notification.
+	- wmpomme: add video switch support.
 
 version 1.12:
 	- pommed: do not expect at least 3 evdevs at startup; there are

Modified: trunk/wmpomme/Makefile
===================================================================
--- trunk/wmpomme/Makefile	2007-11-27 16:36:02 UTC (rev 392)
+++ trunk/wmpomme/Makefile	2007-11-27 16:38:21 UTC (rev 393)
@@ -6,7 +6,9 @@
 CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS)
 LDFLAGS = -lXpm -lXext -lX11 $(DBUS_LIBS)
 
-SOURCES = wmgeneral.c wmpomme.c ../client-common/dbus-client.c
+SOURCES = wmgeneral.c wmpomme.c \
+	../client-common/dbus-client.c \
+	../client-common/video-client.c
 
 OBJS = $(SOURCES:%.c=%.o)
 
@@ -18,6 +20,8 @@
 
 ../client-common/dbus-client.o: ../client-common/dbus-client.c ../client-common/dbus-client.h
 
+../client-common/dbus-video.o: ../client-common/video-client.c ../client-common/video-client.h
+
 clean:
 	rm -f wmpomme $(OBJS)
 	rm -f *~ ../client-common/*~

Modified: trunk/wmpomme/wmpomme.c
===================================================================
--- trunk/wmpomme/wmpomme.c	2007-11-27 16:36:02 UTC (rev 392)
+++ trunk/wmpomme/wmpomme.c	2007-11-27 16:38:21 UTC (rev 393)
@@ -43,6 +43,7 @@
 #include "wmpomme-master.xpm"
 
 #include "../client-common/dbus-client.h"
+#include "../client-common/video-client.h"
 
 
 struct {
@@ -91,7 +92,7 @@
 
   signals = MBP_DBUS_SIG_LCD | MBP_DBUS_SIG_KBD
             | MBP_DBUS_SIG_VOL | MBP_DBUS_SIG_MUTE
-            | MBP_DBUS_SIG_LIGHT;
+            | MBP_DBUS_SIG_LIGHT | MBP_DBUS_SIG_VIDEO;
 
   conn = mbp_dbus_init(&dbus_err, signals);
 
@@ -176,6 +177,10 @@
 				DBUS_TYPE_BOOLEAN, &mbp.snd_mute,
 				DBUS_TYPE_INVALID);
 	}
+      else if (dbus_message_is_signal(msg, "org.pommed.signal.videoSwitch", "videoSwitch"))
+	{
+	  mbp_video_switch();
+	}
       else if (dbus_message_is_signal(msg, DBUS_INTERFACE_LOCAL, "Disconnected"))
 	{
 	  printf("DBus disconnected\n");