[maemo-commits] [maemo-commits] r15825 - in projects/haf/trunk/osso-af-utils: debian src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2008-08-04 13:01:03 +0300 (Mon, 04 Aug 2008)
New Revision: 15825

Modified:
   projects/haf/trunk/osso-af-utils/debian/changelog
   projects/haf/trunk/osso-af-utils/src/play-sound.c
Log:
releasing


Modified: projects/haf/trunk/osso-af-utils/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-utils/debian/changelog	2008-07-31 15:17:37 UTC (rev 15824)
+++ projects/haf/trunk/osso-af-utils/debian/changelog	2008-08-04 10:01:03 UTC (rev 15825)
@@ -1,9 +1,9 @@
-osso-af-utils (2.0-1~unreleased) unstable; urgency=low
+osso-af-utils (2.0-1) unstable; urgency=low
 
   * First Fremantle version.
-  * Drop libesd dependency and use libcanberra instead. Fixes: NB#87262
+  * libcanberra instead of libesd. Fixes: NB#87262
 
- -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu, 31 Jul 2008 16:52:02 +0300
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 04 Aug 2008 12:52:25 +0300
 
 osso-af-utils (1.17-1) unstable; urgency=low
 

Modified: projects/haf/trunk/osso-af-utils/src/play-sound.c
===================================================================
--- projects/haf/trunk/osso-af-utils/src/play-sound.c	2008-07-31 15:17:37 UTC (rev 15824)
+++ projects/haf/trunk/osso-af-utils/src/play-sound.c	2008-08-04 10:01:03 UTC (rev 15825)
@@ -51,9 +51,11 @@
         else 
                 pan = 2;
 
-        /* The full volume should be about 30% of maximum,
+        /* FIXME: This might need adjusting...
+         *
+         * The volume is from -0dB to -6dB,
            The full volume is marked as 2 in gconf */
-        volume = ((float)pan / 2.0) * 0.3;
+        volume = ((1.0 - (float)pan / 2.0)) * (-6.0);
 
         if ((ret = ca_context_create(&ca_con)) != CA_SUCCESS) {
                 fprintf(stderr, "ca_context_create: %s\n", ca_strerror(ret));
@@ -66,7 +68,7 @@
         ca_proplist_create(&pl);
         ca_proplist_sets(pl, CA_PROP_MEDIA_FILENAME, filename);
         ca_proplist_setf(pl, CA_PROP_CANBERRA_VOLUME, "%f", volume);
-    
+
         ret = ca_context_play_full(ca_con, 0, pl, callback, NULL);
         fprintf(stderr, "ca_context_play_full (vol %f): %s\n", volume,
                 ca_strerror(ret));