r559 - in trunk/src/target/OM-2007/applications/openmoko-dialer: . src

tony_guan at sita.openmoko.org tony_guan at sita.openmoko.org
Tue Jan 16 06:41:48 CET 2007


Author: tony_guan
Date: 2007-01-16 06:41:33 +0100 (Tue, 16 Jan 2007)
New Revision: 559

Modified:
   trunk/src/target/OM-2007/applications/openmoko-dialer/configure.ac
   trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am
   trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c
Log:
Volume control added


Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/configure.ac
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/configure.ac	2007-01-16 02:48:31 UTC (rev 558)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/configure.ac	2007-01-16 05:41:33 UTC (rev 559)
@@ -13,12 +13,18 @@
 # base deps
 PKG_CHECK_MODULES(OPENMOKO, openmoko-libs >= 0.0.1,,
                  AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.0.1 not installed ***]))
+                 
 PKG_CHECK_MODULES(LIBGSMD, libgsmd ,,
                  AC_MSG_ERROR([*** Required libgsmd not installed ***]))
 
-LIBS="$LIBS $GTK_LIBS $LIBGSMD_LIBS"
-CFLAGS="$CFLAGS $OPENMOKO_CFLAGS $LIBGSMD_CFLAGS"
+PKG_CHECK_MODULES(LIBASOUND, alsa,,
+                 AC_MSG_ERROR([*** Required libasound not installed ***]))
 
+
+LIBS="$LIBS $GTK_LIBS $LIBGSMD_LIBS $LIBASOUND_LIBS -lm -ldl"
+
+CFLAGS="$CFLAGS $OPENMOKO_CFLAGS $LIBGSMD_CFLAGS $LIBASOUND_CFLAGS"
+
 # output stuff
 AC_OUTPUT([
 Makefile

Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am	2007-01-16 02:48:31 UTC (rev 558)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am	2007-01-16 05:41:33 UTC (rev 559)
@@ -1,4 +1,4 @@
-INCLUDES = -DPKGDATADIR=\"$(pkgdatadir)\" @OPENMOKO_CFLAGS@ -Wall -std=c99 -pedantic
+INCLUDES = -DPKGDATADIR=\"$(pkgdatadir)\" @OPENMOKO_CFLAGS@ -Wall  -pedantic
 
 bin_PROGRAMS = openmoko-dialer
 
@@ -19,7 +19,8 @@
 openmoko-dialer-window-outgoing.c\
 openmoko-dialer-window-incoming.c\
 openmoko-dialer-window-talking.c\
-moko-dialer-status.c
+moko-dialer-status.c\
+alsa.c
 
 openmoko_dialer_LDADD = @OPENMOKO_LIBS@
 

Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c	2007-01-16 02:48:31 UTC (rev 558)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c	2007-01-16 05:41:33 UTC (rev 559)
@@ -15,7 +15,7 @@
  *
  *  Current Version: $Rev$ ($Date) [$Author: Tony Guan $]
  */
-
+#include "alsa.h"
 #include <libmokoui/moko-finger-tool-box.h>
 #include <libmokoui/moko-finger-window.h>
 #include <libmokoui/moko-finger-wheel.h>
@@ -36,12 +36,32 @@
 
 void
 openmoko_wheel_press_left_up_cb(GtkWidget *widget, MOKO_DIALER_APP_DATA * appdata)
-{DBG_ENTER();
+{
+DBG_ENTER();
+ gint l , r;
+ alsa_get_volume(&l, &r);
+alsa_set_volume(l+10, r+10);
+
+ alsa_get_volume(&l, &r);
+ g_print("l = %d, r = %d\n", l, r);
+
+/*
+    l = 90; 
+    r = 90;
+
+*/    
+
 }
 
 void
 openmoko_wheel_press_right_down_cb(GtkWidget *widget, MOKO_DIALER_APP_DATA * appdata)
 {
+ gint l , r;
+  alsa_get_volume(&l, &r);
+alsa_set_volume(l-10, r-10);
+ alsa_get_volume(&l, &r);
+ g_print("l = %d, r = %d\n", l, r);
+
 DBG_ENTER();
 }
 





More information about the commitlog mailing list