[maemo-commits] [maemo-commits] r18938 - in projects/haf/trunk/hildon-welcome: . data debian src

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2009-07-22 12:33:46 +0300 (Wed, 22 Jul 2009)
New Revision: 18938

Added:
   projects/haf/trunk/hildon-welcome/data/04hildon-welcome-wait
Modified:
   projects/haf/trunk/hildon-welcome/configure.ac
   projects/haf/trunk/hildon-welcome/data/Makefile.am
   projects/haf/trunk/hildon-welcome/debian/changelog
   projects/haf/trunk/hildon-welcome/debian/control
   projects/haf/trunk/hildon-welcome/debian/hildon-welcome.files
   projects/haf/trunk/hildon-welcome/src/main.c
Log:
Sync from projects

Modified: projects/haf/trunk/hildon-welcome/configure.ac
===================================================================
--- projects/haf/trunk/hildon-welcome/configure.ac	2009-07-22 09:32:13 UTC (rev 18937)
+++ projects/haf/trunk/hildon-welcome/configure.ac	2009-07-22 09:33:46 UTC (rev 18938)
@@ -43,6 +43,7 @@
   gstreamer-interfaces-0.10 >= 0.10.0
   gstreamer-plugins-base-0.10 >= 0.10.0
   xcomposite
+  profile
   $DBUS_PACKAGE
   $MCE_PACKAGE
   $MAEMO_LAUNCHER_PACKAGE

Added: projects/haf/trunk/hildon-welcome/data/04hildon-welcome-wait
===================================================================
--- projects/haf/trunk/hildon-welcome/data/04hildon-welcome-wait	2009-07-22 09:32:13 UTC (rev 18937)
+++ projects/haf/trunk/hildon-welcome/data/04hildon-welcome-wait	2009-07-22 09:33:46 UTC (rev 18938)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+while pidof hildon-welcome; do
+  sleep 1;
+done
+

Modified: projects/haf/trunk/hildon-welcome/data/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-welcome/data/Makefile.am	2009-07-22 09:32:13 UTC (rev 18937)
+++ projects/haf/trunk/hildon-welcome/data/Makefile.am	2009-07-22 09:33:46 UTC (rev 18938)
@@ -1,2 +1,4 @@
 xsessiondir = $(sysconfdir)/X11/Xsession.d
 xsession_SCRIPTS = 10hildon_welcome
+xsessionpostdir = $(sysconfdir)/X11/Xsession.post
+xsessionpost_SCRIPTS = 04hildon-welcome-wait

Modified: projects/haf/trunk/hildon-welcome/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-welcome/debian/changelog	2009-07-22 09:32:13 UTC (rev 18937)
+++ projects/haf/trunk/hildon-welcome/debian/changelog	2009-07-22 09:33:46 UTC (rev 18938)
@@ -1,10 +1,24 @@
-hildon-welcome (0.19-1) unstable; urgency=low
+hildon-welcome (0.20-1) unstable; urgency=low
 
   [ Gabriel Schulhof ]
   * Fork into the background when poised to play first logo.
+    Fixes: NB#126816 - hildon welcome parallel startup
 
- -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Mon, 15 Jun 2009 14:07:27 +0300
+ -- Viktor Nagy <viktor.nagy at blumsoft.eu>  Tue, 14 Jul 2009 15:51:56 +0200
 
+hildon-welcome (0.19-2) unstable; urgency=low
+
+  * Added a missing build dependency.
+
+ -- Viktor Nagy <vik at garage.maemo.org>  Thu, 02 Jul 2009 14:40:30 +0200
+
+hildon-welcome (0.19-1) unstable; urgency=low
+
+  * Use fakesink for audio when profile is silent
+    Fixes: NB#120890 - Nokia handshaking Wake-Up animation is broken in silent mode
+
+ -- Viktor Nagy <vik at garage.maemo.org>  Wed, 01 Jul 2009 13:31:04 +0200
+
 hildon-welcome (0.18-1) unstable; urgency=low
 
   [ Peter Csaszar ]

Modified: projects/haf/trunk/hildon-welcome/debian/control
===================================================================
--- projects/haf/trunk/hildon-welcome/debian/control	2009-07-22 09:32:13 UTC (rev 18937)
+++ projects/haf/trunk/hildon-welcome/debian/control	2009-07-22 09:33:46 UTC (rev 18938)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Gabriel Schulhof <gabriel.schulhof at nokia.com>
 Uploaders: Gabriel Schulhof <gabriel.schulhof at nokia.com>
-Build-Depends: debhelper (>= 4.1.0), libglib2.0-dev (>= 2.2.0), libgstreamer0.10-dev (>= 0.10.0), libgstreamer-plugins-base0.10-dev (>= 0.10.0), libxcomposite-dev, mce-dev, libdbus-1-dev, maemo-launcher-dev
+Build-Depends: debhelper (>= 4.1.0), libglib2.0-dev (>= 2.2.0), libgstreamer0.10-dev (>= 0.10.0), libgstreamer-plugins-base0.10-dev (>= 0.10.0), libxcomposite-dev, mce-dev, libdbus-1-dev, maemo-launcher-dev, libprofile-dev, libdbus-glib-1-dev
 Standards-Version: 3.7.2
 
 Package: hildon-welcome

Modified: projects/haf/trunk/hildon-welcome/debian/hildon-welcome.files
===================================================================
--- projects/haf/trunk/hildon-welcome/debian/hildon-welcome.files	2009-07-22 09:32:13 UTC (rev 18937)
+++ projects/haf/trunk/hildon-welcome/debian/hildon-welcome.files	2009-07-22 09:33:46 UTC (rev 18938)
@@ -1,2 +1,3 @@
 usr/bin/hildon-welcome*
 etc/X11/Xsession.d/10hildon_welcome
+etc/X11/Xsession.post/04hildon-welcome-wait

Modified: projects/haf/trunk/hildon-welcome/src/main.c
===================================================================
--- projects/haf/trunk/hildon-welcome/src/main.c	2009-07-22 09:32:13 UTC (rev 18937)
+++ projects/haf/trunk/hildon-welcome/src/main.c	2009-07-22 09:33:46 UTC (rev 18938)
@@ -40,6 +40,8 @@
 #define DEFAULT_VIDEO_PIPELINE_STR " playbin2 uri=file://%s " /* " flags=99 " <-- doesn't work with still images */
 #define DEFAULT_AUDIO_PIPELINE_STR " filesrc location=%s ! decodebin2 ! autoaudiosink "
 #define DEFAULT_SHUSH_PIPELINE_STR " audiotestsrc ! volume volume=0 ! autoaudiosink "
+#define AUDIO_FAKESINK " audio-sink=fakesink "
+#define SILENT_PROFILE "silent"
 
 static char *video_pipeline_str = DEFAULT_VIDEO_PIPELINE_STR;
 static char *audio_pipeline_str = DEFAULT_AUDIO_PIPELINE_STR;
@@ -230,9 +232,17 @@
 
   g_debug("play_logo: playing (video = '%s', audio = '%s', duration = '%d')", video, audio, duration);
 
-  if (video && video[0])
+  if (video && video[0]) {
     g_string_append_printf(pipeline_str, video_pipeline_str, video);
 
+    // in silent mode audio is routed to fakesink 
+    // this is a workaround for a pulseaudio performance problem
+    const char *profile = profile_get_profile();
+    if (g_str_equal(profile, SILENT_PROFILE)) {
+        g_string_append(pipeline_str, AUDIO_FAKESINK);
+    }
+  }
+
   if (audio && audio[0]) {
     if ('s' == audio[0] && 0 == audio[1])
       g_string_append_printf(pipeline_str, shush_pipeline_str);
@@ -240,6 +250,7 @@
       g_string_append_printf(pipeline_str, audio_pipeline_str, audio);
   }
 
+  g_debug("pipeline str: %s", pipeline_str->str);
   pipeline = gst_parse_launch(pipeline_str->str, NULL);
   g_string_free(pipeline_str, TRUE);