r3865 - in trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src/phone-kit

[chris at sita.openmoko.org]

Author: chris
Date: 2008-01-17 13:39:04 +0100 (Thu, 17 Jan 2008)
New Revision: 3865

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
Log:
        * src/phone-kit/moko-talking.c: (moko_talking_init):
        Make the volume slider control the 'Headphone' mixer, fixes bug #394


Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2008-01-17 11:52:40 UTC (rev 3864)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2008-01-17 12:39:04 UTC (rev 3865)
@@ -1,5 +1,10 @@
 2008-01-17  Chris Lord  <chris at openedhand.com>
 
+	* src/phone-kit/moko-talking.c: (moko_talking_init):
+	Make the volume slider control the 'Headphone' mixer, fixes bug #394
+
+2008-01-17  Chris Lord  <chris at openedhand.com>
+
 	* src/phone-kit/moko-network.c: (on_network_registered),
 	(moko_network_get_country_code):
 	Do get the operators list, but only when roaming - when not roaming,

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c	2008-01-17 11:52:40 UTC (rev 3864)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c	2008-01-17 12:39:04 UTC (rev 3865)
@@ -69,8 +69,7 @@
   
   gint call_direction;
   
-  MokoAlsaVolumeControl *amp_left;
-  MokoAlsaVolumeControl *amp_right;
+  MokoAlsaVolumeControl *headphone;
 };
 
 enum
@@ -510,13 +509,6 @@
 }
 
 static void
-volume_changed_cb (MokoAlsaVolumeControl *control1, gdouble volume,
-                   MokoAlsaVolumeControl *control2)
-{
-  moko_alsa_volume_control_set_volume (control2, volume);
-}
-
-static void
 moko_talking_init (MokoTalking *talking)
 {
   MokoTalkingPrivate *priv;
@@ -565,21 +557,14 @@
   gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, 4);
   
   /* Volume controls */
-  priv->amp_left = moko_alsa_volume_control_new ();
-  moko_alsa_volume_control_set_device_from_name (priv->amp_left, "neo1973");
-  moko_alsa_volume_control_set_element_from_name (priv->amp_left, "Amp Left");
-  priv->amp_right = moko_alsa_volume_control_new ();
-  moko_alsa_volume_control_set_device_from_name (priv->amp_right, "neo1973");
-  moko_alsa_volume_control_set_element_from_name (priv->amp_right, "Amp Right");
+  priv->headphone = moko_alsa_volume_control_new ();
+  moko_alsa_volume_control_set_device_from_name (priv->headphone, "neo1973");
+  moko_alsa_volume_control_set_element_from_name (priv->headphone, "Headphone");
   
   priv->volume = moko_alsa_volume_scale_new (GTK_ORIENTATION_HORIZONTAL);
   moko_alsa_volume_scale_set_control (MOKO_ALSA_VOLUME_SCALE (priv->volume),
-                                      priv->amp_left);
+                                      priv->headphone);
   
-  /* Chain Amp Left to Amp Right */
-  g_signal_connect (priv->amp_left, "volume_changed",
-                    G_CALLBACK (volume_changed_cb), priv->amp_right);
-
   /* Outgoing call and talking share the same toolbar */
   priv->main_bar = toolbar = gtk_toolbar_new ();
   gtk_box_pack_start (GTK_BOX (main_vbox), toolbar, FALSE, FALSE, 0);