Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r2200 - trunk/src/host/qemu-neo1973 ([EMAIL PROTECTED])
2. r2201 - trunk/oe/packages/pulseaudio ([EMAIL PROTECTED])
3. r2202 - in trunk/oe/packages: openmoko-base pulseaudio
([EMAIL PROTECTED])
4. r2203 - in
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu: .
src ([EMAIL PROTECTED])
5. r2204 -
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src
([EMAIL PROTECTED])
6. r2205 - in trunk/oe/packages/openmoko-base: .
openmoko-sound-system ([EMAIL PROTECTED])
--- Begin Message ---
Author: andrew
Date: 2007-06-09 12:09:17 +0200 (Sat, 09 Jun 2007)
New Revision: 2200
Modified:
trunk/src/host/qemu-neo1973/configure
trunk/src/host/qemu-neo1973/usb-linux-gadget.c
Log:
Check linux-headers version and include only headers appropriate for given
version.
Fixes http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=592
Modified: trunk/src/host/qemu-neo1973/configure
===================================================================
--- trunk/src/host/qemu-neo1973/configure 2007-06-09 00:09:10 UTC (rev
2199)
+++ trunk/src/host/qemu-neo1973/configure 2007-06-09 10:09:17 UTC (rev
2200)
@@ -632,8 +632,36 @@
# usb_gadgetfs headers
cat > $TMPC << EOF
-#include <linux/usb_ch9.h>
-#include <linux/usb_gadgetfs.h>
+/* usb-linux-gadget.c */
+#include <stdlib.h>
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 21)
+# include <linux/usb_ch9.h>
+# include <linux/usb_gadgetfs.h>
+#else
+# include <linux/usb/ch9.h>
+# include <linux/usb_gadgetfs.h>
+#endif
+#include <poll.h>
+#include <signal.h>
+
+/* vl.h */
+# include <stdlib.h>
+# include <stdio.h>
+# include <stdarg.h>
+# include <string.h>
+# include <inttypes.h>
+# include <limits.h>
+# include <time.h>
+# include <ctype.h>
+# include <errno.h>
+# include <unistd.h>
+# include <fcntl.h>
+# include <sys/stat.h>
+
+/* hw/usb.h */
+# define USB_SPEED_LOW 0
+
int main(void) { return 0; }
EOF
if $cc -o $TMPE $TMPC 2> /dev/null ; then
Modified: trunk/src/host/qemu-neo1973/usb-linux-gadget.c
===================================================================
--- trunk/src/host/qemu-neo1973/usb-linux-gadget.c 2007-06-09 00:09:10 UTC
(rev 2199)
+++ trunk/src/host/qemu-neo1973/usb-linux-gadget.c 2007-06-09 10:09:17 UTC
(rev 2200)
@@ -21,15 +21,22 @@
*/
#include "config-host.h"
#if defined(CONFIG_GADGETFS)
-#include <linux/usb_ch9.h>
-#include <linux/usb_gadgetfs.h>
-#include <poll.h>
-#include <signal.h>
+# include <stdlib.h>
+# include <linux/version.h>
+# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 21)
+# include <linux/usb_ch9.h>
+# include <linux/usb_gadgetfs.h>
+# else
+# include <linux/usb/ch9.h>
+# include <linux/usb_gadgetfs.h>
+# endif
+# include <poll.h>
+# include <signal.h>
/* Must be after usb_ch9.h */
-#include "vl.h"
+# include "vl.h"
-#define USBGADGETFS_PATH "/dev/gadget"
+# define USBGADGETFS_PATH "/dev/gadget"
struct gadget_state_s {
USBPort port;
@@ -804,7 +811,7 @@
}
#else
-#include "vl.h"
+# include "vl.h"
int usb_gadget_init(void)
{
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-09 15:18:58 +0200 (Sat, 09 Jun 2007)
New Revision: 2201
Modified:
trunk/oe/packages/pulseaudio/pulseaudio_0.9.6.bb
Log:
oe: improve pulseaudio packaging
Modified: trunk/oe/packages/pulseaudio/pulseaudio_0.9.6.bb
===================================================================
--- trunk/oe/packages/pulseaudio/pulseaudio_0.9.6.bb 2007-06-09 10:09:17 UTC
(rev 2200)
+++ trunk/oe/packages/pulseaudio/pulseaudio_0.9.6.bb 2007-06-09 13:18:58 UTC
(rev 2201)
@@ -48,17 +48,22 @@
fi
}
-LEAD_SONAME = "libpulse.so"
-
-PACKAGES =+ "${PN}-bin ${PN}-conf"
+PACKAGES =+ "libpulsecore libpulse libpulse-simple libpulse-browse
libpulse-mainloop-glib pulseaudio-server \
+ pulseaudio-misc pulseaudio-gconf-helper"
PACKAGES_DYNAMIC = "pulseaudio-module-* pulseaudio-lib-* libpulse-bin
libpulse-module-* libpulse-lib*"
+FILES_libpulsecore = "${libdir}/libpulsecore.so.*"
+FILES_libpulse = "${libdir}/libpulse.so.*"
+FILES_libpulse-simple = "${libdir}/libpulse-simple.so.*"
+FILES_libpulse-browse = "${libdir}/libpulse-browse.so.*"
+FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*"
+
FILES_${PN}-dbg += "${libexecdir}/pulse/.debug \
${libdir}/pulse-0.9/modules/.debug"
FILES_${PN}-dev += "${libdir}/pulse-0.9/modules/*.la"
-FILES_${PN}-conf = "${sysconfdir}"
-FILES_${PN}-bin = "${bindir}/* \
- ${sysconfdir}/default/volatiles/volatiles.04_pulse"
+FILES_${PN}-server = "${bindir}/pulseaudio ${sysconfdir}"
+FILES_${PN}-gconf-helper = "${libexecdir}/pulse/gconf-helper"
+FILES_${PN}-misc = "${bindir}"
CONFFILES_${PN}-conf = "\
${sysconfdir}/pulse/default.pa \
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-09 15:22:48 +0200 (Sat, 09 Jun 2007)
New Revision: 2202
Modified:
trunk/oe/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
trunk/oe/packages/pulseaudio/pulseaudio_0.9.6.bb
Log:
oe/openmoko-sound-system: catch up with corrected module/lib naming in
pulseaudio
Modified: trunk/oe/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
===================================================================
--- trunk/oe/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
2007-06-09 13:18:58 UTC (rev 2201)
+++ trunk/oe/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
2007-06-09 13:22:48 UTC (rev 2202)
@@ -1,16 +1,16 @@
DESCRIPTION = "OpenMoko Sound System"
SECTION = "openmoko/base"
RDEPENDS = "\
- libpulse-bin \
- libpulse-module-alsa-sink \
- libpulse-module-alsa-source \
- libpulse-module-cli \
- libpulse-module-esound-protocol-unix \
- libpulse-module-simple-protocol-tcp \
- libpulse-module-native-protocol-unix \
- libpulse-module-cli-protocol-unix \
+ pulseaudio-server \
+ pulseaudio-module-alsa-sink \
+ pulseaudio-module-alsa-source \
+ pulseaudio-module-cli \
+ pulseaudio-module-esound-protocol-unix \
+ pulseaudio-module-simple-protocol-tcp \
+ pulseaudio-module-native-protocol-unix \
+ pulseaudio-module-cli-protocol-unix \
"
-PR = "r0"
+PR = "r1"
inherit openmoko-base
Modified: trunk/oe/packages/pulseaudio/pulseaudio_0.9.6.bb
===================================================================
--- trunk/oe/packages/pulseaudio/pulseaudio_0.9.6.bb 2007-06-09 13:18:58 UTC
(rev 2201)
+++ trunk/oe/packages/pulseaudio/pulseaudio_0.9.6.bb 2007-06-09 13:22:48 UTC
(rev 2202)
@@ -50,7 +50,7 @@
PACKAGES =+ "libpulsecore libpulse libpulse-simple libpulse-browse
libpulse-mainloop-glib pulseaudio-server \
pulseaudio-misc pulseaudio-gconf-helper"
-PACKAGES_DYNAMIC = "pulseaudio-module-* pulseaudio-lib-* libpulse-bin
libpulse-module-* libpulse-lib*"
+PACKAGES_DYNAMIC = "pulseaudio-module-* pulseaudio-lib-*"
FILES_libpulsecore = "${libdir}/libpulsecore.so.*"
FILES_libpulse = "${libdir}/libpulse.so.*"
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-09 18:12:05 +0200 (Sat, 09 Jun 2007)
New Revision: 2203
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/configure.ac
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.h
Log:
openmoko-panel-mainmenu: play sounds using pulseaudio
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/configure.ac
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/configure.ac
2007-06-09 13:22:48 UTC (rev 2202)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/configure.ac
2007-06-09 16:12:05 UTC (rev 2203)
@@ -17,12 +17,12 @@
AC_MSG_ERROR([matchbox-lib required]))
PKG_CHECK_MODULES(LIBSN, libstartup-notification-1.0, ,
AC_MSG_ERROR([*** Required Startup Notification library not
installed ***]))
+PKG_CHECK_MODULES(LIBPULSE, libpulse,,
+ AC_MSG_ERROR([*** Required pulseaudio client library not
installed ***]))
-#AC_SUBST(SN_LIBS)
-#AC_SUBST(SN_CFLAGS)
-LIBS="$LIBS $OPENMOKO_LIBS $LIBMB_LIBS $LIBSN_LIBS"
-CFLAGS="$CFLAGS $OPENMOKO_CFLAGS $LIBMB_CFLAGS $LIBSN_CFLAGS"
+LIBS="$LIBS $OPENMOKO_LIBS $LIBMB_LIBS $LIBSN_LIBS $LIBPULSE_LIBS"
+CFLAGS="$CFLAGS $OPENMOKO_CFLAGS $LIBMB_CFLAGS $LIBSN_CFLAGS $LIBPULSE_CFLAGS"
# output stuff
AC_OUTPUT([
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
2007-06-09 13:22:48 UTC (rev 2202)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
2007-06-09 16:12:05 UTC (rev 2203)
@@ -29,6 +29,8 @@
#include <X11/Xlib.h>
#include <X11/Xatom.h>
+#include <pulse/pulseaudio.h>
+
#include <fcntl.h>
#include <string.h>
#include <errno.h>
@@ -38,8 +40,8 @@
#include <sys/stat.h>
#include <linux/input.h>
-#undef DEBUG_THIS_FILE
-//#define DEBUG_THIS_FILE
+//#undef DEBUG_THIS_FILE
+#define DEBUG_THIS_FILE
//FIXME find out through sysfs
#ifndef DEBUG_THIS_FILE
@@ -80,6 +82,8 @@
} PowerState;
PowerState power_state = NORMAL;
+static pa_context* pac;
+
/* Borrowed from libwnck */
static Window get_window_property( Window xwindow, Atom atom )
{
@@ -149,7 +153,7 @@
g_source_add_poll( button_watcher, &power_fd );
g_source_attach( button_watcher, NULL );
- if ( getenv( "MOKO_POWERSAVE" ) )
+ if ( getenv( "MOKO_POWERSAVE" ) == NULL )
{
int tsfd = open( TOUCHSCREEN_EVENT_PATH, O_RDONLY );
@@ -163,6 +167,7 @@
panel_mainmenu_powersave_reset();
panel_mainmenu_set_display( 100 );
+ panel_mainmenu_sound_init();
}
else
g_debug( "MOKO_POWERSAVE set. Not enabling power management." );
@@ -369,7 +374,7 @@
if ( event.value == 1 ) /* pressed */
{
g_debug( "stylus pressed" );
- panel_mainmenu_play_stylus_click();
+ panel_mainmenu_sound_play( "touchscreen" );
}
else if ( event.value == 0 ) /* released */
{
@@ -439,10 +444,46 @@
return FALSE;
}
-void panel_mainmenu_play_stylus_click()
+void panel_mainmenu_sound_state_cb( pa_context* pac, void* userdata )
{
- g_debug( "mainmenu play stylus click" );
- //TODO add function to libmokoui that talks alsa
- //yes, this is hardcoded... it's just a proof of concept
- system( "/usr/bin/aplay /usr/share/openmoko/touchscreen_click.wav &" );
+ if ( pa_context_get_state( pac ) == PA_CONTEXT_READY )
+ {
+ panel_mainmenu_sound_play( "startup" );
+ }
}
+
+void panel_mainmenu_sound_init()
+{
+ pa_threaded_mainloop* mainloop = pa_threaded_mainloop_new();
+
+ if ( !mainloop )
+ {
+ printf( "couldn't create mainloop: %s", strerror( errno ) );
+ return;
+ }
+
+ pa_mainloop_api* mapi = pa_threaded_mainloop_get_api( mainloop );
+
+ pac = pa_context_new( mapi, "test client" );
+ if ( !pac )
+ {
+ printf( "couldn't create pa_context: %s", strerror( errno ) );
+ return;
+ }
+
+ pa_context_set_state_callback( pac, panel_mainmenu_sound_state_cb, NULL );
+ pa_context_connect( pac, NULL, 0, NULL );
+ pa_threaded_mainloop_start( mainloop );
+}
+
+void panel_mainmenu_sound_play( const gchar* samplename )
+{
+ pa_context_play_sample( pac,
+ "startup", // Name of my sample
+ NULL, // Use default sink
+ PA_VOLUME_NORM, // Full volume
+ NULL, // Don't need a callback
+ NULL
+ );
+
+}
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.h
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.h
2007-06-09 13:22:48 UTC (rev 2202)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.h
2007-06-09 16:12:05 UTC (rev 2203)
@@ -37,7 +37,8 @@
gboolean panel_mainmenu_powersave_timeout2( guint timeout );
gboolean panel_mainmenu_powersave_timeout3( guint timeout );
+void panel_mainmenu_sound_init();
void panel_mainmenu_set_display( int brightness );
-void panel_mainmenu_play_stylus_click();
+void panel_mainmenu_sound_play( const gchar* samplename );
#endif
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-09 18:15:23 +0200 (Sat, 09 Jun 2007)
New Revision: 2204
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
Log:
openmoko-panel-mainmenu: make MOKO_POWERSAVE opt-in again
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
2007-06-09 16:12:05 UTC (rev 2203)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
2007-06-09 16:15:23 UTC (rev 2204)
@@ -40,7 +40,7 @@
#include <sys/stat.h>
#include <linux/input.h>
-//#undef DEBUG_THIS_FILE
+#undef DEBUG_THIS_FILE
#define DEBUG_THIS_FILE
//FIXME find out through sysfs
@@ -153,7 +153,7 @@
g_source_add_poll( button_watcher, &power_fd );
g_source_attach( button_watcher, NULL );
- if ( getenv( "MOKO_POWERSAVE" ) == NULL )
+ if ( getenv( "MOKO_POWERSAVE" ) != NULL )
{
int tsfd = open( TOUCHSCREEN_EVENT_PATH, O_RDONLY );
@@ -170,7 +170,7 @@
panel_mainmenu_sound_init();
}
else
- g_debug( "MOKO_POWERSAVE set. Not enabling power management." );
+ g_debug( "MOKO_POWERSAVE=yes not set. Not enabling power management."
);
return TRUE;
}
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-09 19:42:22 +0200 (Sat, 09 Jun 2007)
New Revision: 2205
Added:
trunk/oe/packages/openmoko-base/openmoko-sound-system/pulseaudio
Modified:
trunk/oe/packages/openmoko-base/openmoko-sound-system/session
trunk/oe/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
Log:
oe/openmoko-sound-system: add basic init script
Added: trunk/oe/packages/openmoko-base/openmoko-sound-system/pulseaudio
===================================================================
--- trunk/oe/packages/openmoko-base/openmoko-sound-system/pulseaudio
2007-06-09 16:15:23 UTC (rev 2204)
+++ trunk/oe/packages/openmoko-base/openmoko-sound-system/pulseaudio
2007-06-09 17:42:22 UTC (rev 2205)
@@ -0,0 +1,47 @@
+#!/bin/sh
+#
+# pulseaudio This shell script starts and stops pulseaudio.
+#
+# chkconfig: 345 90 40
+# description: Pulseaudio manages the sound input/output
+# processname: pulseaudio
+
+# If you must specify special options, uncomment and modify the next line
+OPTS="-s 115200 -F"
+
+# Source function library.
+#. /etc/rc.d/init.d/functions
+
+RETVAL=0
+prog="pulseaudio"
+
+start() {
+ echo -n "Starting the audio server..."
+ pulseaudio --system -nDF /etc/share/pulseaudio/session
+ echo "success"
+}
+
+stop() {
+ # Stop daemons.
+ echo -n "Shutting down $prog: "
+ killall pulseaudio
+}
+
+# See how we were called.
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart|reload)
+ stop
+ start
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart}"
+ exit 1
+esac
+
+exit $RETVAL
Property changes on:
trunk/oe/packages/openmoko-base/openmoko-sound-system/pulseaudio
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/oe/packages/openmoko-base/openmoko-sound-system/session
===================================================================
--- trunk/oe/packages/openmoko-base/openmoko-sound-system/session
2007-06-09 16:15:23 UTC (rev 2204)
+++ trunk/oe/packages/openmoko-base/openmoko-sound-system/session
2007-06-09 17:42:22 UTC (rev 2205)
@@ -21,9 +21,6 @@
load-sample-lazy /usr/share/openmoko/sounds/notify_doorbell.wav x11-bell
load-module module-x11-bell sample=x11-bell
-# Load key click sample
-load-sample /usr/share/openmoko/sounds/touchscreen_click.wav
-
-# Play a welcome sound
-play-file /usr/share/openmoko/sounds/openmoko_startup.wav output
-
+# Load samples
+load-sample startup /usr/share/openmoko/sounds/openmoko_startup.wav
+load-sample touchscreen /usr/share/openmoko/sounds/touchscreen_click.wav
Modified: trunk/oe/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
===================================================================
--- trunk/oe/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
2007-06-09 16:15:23 UTC (rev 2204)
+++ trunk/oe/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
2007-06-09 17:42:22 UTC (rev 2205)
@@ -10,16 +10,22 @@
pulseaudio-module-native-protocol-unix \
pulseaudio-module-cli-protocol-unix \
"
-PR = "r1"
+PR = "r3"
-inherit openmoko-base
+inherit openmoko-base update-rc.d
-SRC_URI = "file://session"
+INITSCRIPT_NAME = "pulseaudio"
+INITSCRIPT_PARAMS = "defaults 35"
+
+SRC_URI = "file://pulseaudio \
+ file://session"
S = "${WORKDIR}"
do_install() {
- install -d ${D}/${sysconfdir}/pulseaudio
- install -m 0755 ${WORKDIR}/session ${D}/${sysconfdir}/pulseaudio/session
+ install -d ${D}/${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/pulseaudio ${D}/${sysconfdir}/init.d/
+ install -d ${D}/${sysconfdir}/pulse
+ install -m 0755 ${WORKDIR}/session ${D}/${sysconfdir}/pulse/session
}
PACKAGE_ARCH = "all"
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
