r3182 - in trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src

[alphaone at sita.openmoko.org]

Author: alphaone
Date: 2007-10-16 10:11:04 +0200 (Tue, 16 Oct 2007)
New Revision: 3182

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-sound.c
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-sound.h
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c
Log:
        * src/moko-sound.{c,h}: Add GSM speaker out sound profile

        * src/moko-dialer.c: (on_talking_speaker_toggle):
        * src/moko-talking.c: (on_speaker_toggled):
        Speaker button now toggles the GSM speaker out profile
        (requires recent alsa-state package)



Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-10-15 16:44:47 UTC (rev 3181)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-10-16 08:11:04 UTC (rev 3182)
@@ -1,3 +1,12 @@
+2007-10-16  Daniel Willmann <alphaone at openmoko.org>
+
+        * src/moko-sound.{c,h}: Add GSM speaker out sound profile
+
+				* src/moko-dialer.c: (on_talking_speaker_toggle):
+        * src/moko-talking.c: (on_speaker_toggled):
+				Speaker button now toggles the GSM speaker out profile
+				(requires recent alsa-state package)
+
 2007-10-15  Thomas Wood  <thomas at openedhand.com>
 
 	Based on patch by: Roman Moravcik <roman.moravcik at gmail.com>

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c	2007-10-15 16:44:47 UTC (rev 3181)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c	2007-10-16 08:11:04 UTC (rev 3182)
@@ -37,6 +37,7 @@
 #include "moko-keypad.h"
 #include "moko-notify.h"
 #include "moko-talking.h"
+#include "moko-sound.h"
 
 G_DEFINE_TYPE (MokoDialer, moko_dialer, G_TYPE_OBJECT)
 
@@ -438,6 +439,15 @@
                            MokoDialer  *dialer)
 {
   /* Toggle speaker phone */
+  static int on_speaker = FALSE;
+
+  if (on_speaker)
+    moko_sound_profile_set(SOUND_PROFILE_GSM_HANDSET);
+  else
+    moko_sound_profile_set(SOUND_PROFILE_GSM_SPEAKER_OUT);
+
+  on_speaker = !on_speaker;
+
   g_debug ("Speaker toggled");
 }
 

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-sound.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-sound.c	2007-10-15 16:44:47 UTC (rev 3181)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-sound.c	2007-10-16 08:11:04 UTC (rev 3182)
@@ -24,7 +24,8 @@
 
 char *sound_profile_filenames[] = { "/etc/gsmhandset.state",
   "/etc/gsmheadset.state",
-  "/etc/stereoout.state" };
+  "/etc/gsmspeakerout.state",
+  "/etc/stereoout.state"};
 
 void moko_sound_profile_set(int profile) {
   char command[100];

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-sound.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-sound.h	2007-10-15 16:44:47 UTC (rev 3181)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-sound.h	2007-10-16 08:11:04 UTC (rev 3182)
@@ -22,6 +22,7 @@
 
 enum { SOUND_PROFILE_GSM_HANDSET,
 SOUND_PROFILE_GSM_HEADSET,
+SOUND_PROFILE_GSM_SPEAKER_OUT,
 SOUND_PROFILE_STEREO_OUT };
 
 void moko_sound_profile_set(int profile);

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c	2007-10-15 16:44:47 UTC (rev 3181)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c	2007-10-16 08:11:04 UTC (rev 3182)
@@ -286,8 +286,8 @@
 static void
 on_speaker_toggled (GtkToggleToolButton *toggle, MokoTalking *talking)
 {
- /*g_signal_emit (G_OBJECT (talking), talking_signals[CANCEL_CALL], 
-                0, gtk_toggle_tool_button_get_active (toggle));*/
+  g_signal_emit (G_OBJECT (talking), talking_signals[SPEAKER_TOGGLE],
+                0, gtk_toggle_tool_button_get_active (toggle));
 }
 
 /* GObject functions */