Changeset 3856


Ignore:
Timestamp:
01/16/08 16:24:27 (5 years ago)
Author:
chris
Message:
  • configure.ac:
  • src/phone-kit/Makefile.am: Add alsa to dependencies and compile volume control object/widget
  • src/phone-kit/moko-alsa-volume-button.c:
  • src/phone-kit/moko-alsa-volume-button.h: Remove unused MokoAlsaVolumeButton?
  • src/phone-kit/moko-talking.c: (volume_changed_cb), (moko_talking_init): Integrate volume control widget, bug #394
Location:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2
Files:
2 added
2 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog

    r3854 r3856  
     12008-01-16  Chris Lord  <chris@openedhand.com> 
     2 
     3        * configure.ac: 
     4        * src/phone-kit/Makefile.am: 
     5        Add alsa to dependencies and compile volume control object/widget 
     6 
     7        * src/phone-kit/moko-alsa-volume-button.c: 
     8        * src/phone-kit/moko-alsa-volume-button.h: 
     9        Remove unused MokoAlsaVolumeButton 
     10 
     11        * src/phone-kit/moko-alsa-volume-scale.[ch]: 
     12        Add new MokoAlsaVolumeScale 
     13 
     14        * src/phone-kit/moko-talking.c: (volume_changed_cb), 
     15        (moko_talking_init): 
     16        Integrate volume control widget, bug #394 
     17 
    1182008-01-16  Chris Lord  <chris@openedhand.com> 
    219 

  • trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac

    r3829 r3856  
    2424PKG_CHECK_MODULES(JANA, libjana libjana-ecal libjana-gtk) 
    2525PKG_CHECK_MODULES(NOTIFY, libnotify) 
     26PKG_CHECK_MODULES(ALSA, alsa) 
    2627 
    2728old_cflags=$CFLAGS 

  • trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/Makefile.am

    r3689 r3856  
    11AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" -DPKGDATADIR=\"$(pkgdatadir)\" 
    2 AM_CFLAGS = -Wall @DIALER_CFLAGS@ @JANA_CFLAGS@ @NOTIFY_CFLAGS@ 
     2AM_CFLAGS = -Wall @DIALER_CFLAGS@ @JANA_CFLAGS@ @NOTIFY_CFLAGS@ @ALSA_CFLAGS@ 
    33 
    44INCLUDES = -I$(top_srcdir)/src/common 
    … …  
    1515        moko-sound.c moko-sound.h \ 
    1616        moko-talking.c moko-talking.h \ 
     17        moko-alsa-volume-control.c moko-alsa-volume-control.h \ 
     18        moko-alsa-volume-scale.c moko-alsa-volume-scale.h \ 
    1719        moko-pin.c moko-pin.h \ 
    1820        moko-mcc-dc.h 
    1921 
    20 phone_kit_LDADD = @DIALER_LIBS@ @JANA_LIBS@ @NOTIFY_LIBS@ $(top_srcdir)/src/common/libdialer-common.a 
     22phone_kit_LDADD = @DIALER_LIBS@ @JANA_LIBS@ @NOTIFY_LIBS@ @ALSA_LIBS@ $(top_srcdir)/src/common/libdialer-common.a 
    2123 
    2224 

  • trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c

    r3829 r3856  
    2424#include "moko-dialer-panel.h" 
    2525#include "moko-dialer-textview.h" 
     26#include "moko-alsa-volume-control.h" 
     27#include "moko-alsa-volume-scale.h" 
    2628 
    2729G_DEFINE_TYPE (MokoTalking, moko_talking, GTK_TYPE_WIDGET) 
    … …  
    5254  GtkWidget *person; 
    5355  GtkWidget *status; 
     56  GtkWidget *volume; 
    5457   
    5558  GtkToolItem *speaker_toggle_btn; 
    … …  
    6669   
    6770  gint call_direction; 
     71   
     72  MokoAlsaVolumeControl *amp_left; 
     73  MokoAlsaVolumeControl *amp_right; 
    6874}; 
    6975 
    … …  
    505511 
    506512static void 
     513volume_changed_cb (MokoAlsaVolumeControl *control1, gdouble volume, 
     514                   MokoAlsaVolumeControl *control2) 
     515{ 
     516  moko_alsa_volume_control_set_volume (control2, volume); 
     517} 
     518 
     519static void 
    507520moko_talking_init (MokoTalking *talking) 
    508521{ 
    … …  
    551564  g_signal_connect (item, "clicked", G_CALLBACK (on_reject_clicked), talking); 
    552565  gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, 4); 
     566   
     567  /* Volume controls */ 
     568  priv->amp_left = moko_alsa_volume_control_new (); 
     569  moko_alsa_volume_control_set_device_from_name (priv->amp_left, "neo1973"); 
     570  moko_alsa_volume_control_set_element_from_name (priv->amp_left, "Amp Left"); 
     571  priv->amp_right = moko_alsa_volume_control_new (); 
     572  moko_alsa_volume_control_set_device_from_name (priv->amp_right, "neo1973"); 
     573  moko_alsa_volume_control_set_element_from_name (priv->amp_right, "Amp Right"); 
     574   
     575  priv->volume = moko_alsa_volume_scale_new (GTK_ORIENTATION_HORIZONTAL); 
     576  moko_alsa_volume_scale_set_control (MOKO_ALSA_VOLUME_SCALE (priv->volume), 
     577                                      priv->amp_left); 
     578   
     579  /* Chain Amp Left to Amp Right */ 
     580  g_signal_connect (priv->amp_left, "volume_changed", 
     581                    G_CALLBACK (volume_changed_cb), priv->amp_right); 
    553582 
    554583  /* Outgoing call and talking share the same toolbar */ 
    … …  
    607636  priv->status = label = gtk_label_new (""); 
    608637  gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); 
     638   
     639  /* The volume control */ 
     640  gtk_box_pack_start (GTK_BOX (vbox), priv->volume, FALSE, TRUE, 12); 
    609641 
    610642  /* Load the pixbufs */ 
Note: See TracChangeset for help on using the changeset viewer.