I have made the following changes intended for : CE:Adaptation:N9xx-common / pulseaudio-modules-n900
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/6893 Thank You, tanuk2 [This message was auto-generated] --- Request # 6893: Messages from BOSS: State: review at 2012-10-04T08:31:17 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:tanuk2:tmp / pulseaudio-modules-n900 -> CE:Adaptation:N9xx-common / pulseaudio-modules-n900 changes files: -------------- --- pulseaudio-modules-n900.changes +++ pulseaudio-modules-n900.changes @@ -0,0 +1,5 @@ +* Thu Sep 4 2012 Tanu Kaskinen <[email protected]> - 0.9.19.0.11 +- Fixes NEMO#326: cmtspeech: Change the retry interval for opening + /dev/cmt_speech from 0.5 seconds to 60 seconds. +- Removed a duplicate patch. + old: ---- pa-0.9.22-cmtspeech-connection-alignment-with-new-pa_thread_ne.patch new: ---- pa-0.9.22-cmtspeech-Change-the-retry-interval-for-opening-dev-.patch spec files: ----------- --- pulseaudio-modules-n900.spec +++ pulseaudio-modules-n900.spec @@ -1,11 +1,13 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.22 +# Generated by: spectacle version 0.25 # + +Name: pulseaudio-modules-n900 + # >> macros # << macros -Name: pulseaudio-modules-n900 Summary: PulseAudio modules for Nokia N900 handset Version: 0.9.19.0.11 Release: 0 @@ -21,17 +23,16 @@ Patch3: pa-0.9.22-Insert-PA_LOG_NOTICE-at-param-of-pa_log_ratelim_B.patch Patch4: pa-0.9.19-mfld-common-updated-parameter-hook-interface.patch Patch5: pa-0.9.22-remove-flat-volume-for-n900.patch +Patch6: pa-0.9.22-cmtspeech-Change-the-retry-interval-for-opening-dev-.patch BuildRequires: pkgconfig(check) BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(pulsecore) BuildRequires: libcmtspeechdata-devel BuildRequires: libtool-ltdl-devel - %description PulseAudio modules for Nokia N900 handset. - %package devel Summary: Development files for MeeGo PulseAudio modules for N900 Group: Development/Libraries @@ -108,6 +109,8 @@ %patch4 -p1 # pa-0.9.22-remove-flat-volume-for-n900.patch %patch5 -p1 +# pa-0.9.22-cmtspeech-Change-the-retry-interval-for-opening-dev-.patch +%patch6 -p1 # >> setup # << setup @@ -121,6 +124,7 @@ # >> build post # << build post + %install rm -rf %{buildroot} # >> install pre @@ -144,33 +148,6 @@ # << install post - - - - - - - - - - - - - - - - - - - - - - - - - - - %files devel %defattr(-,root,root,-) # >> files devel @@ -213,4 +190,3 @@ # >> files mainvolume %{_libdir}/pulse-0.9.22/modules/module-meego-mainvolume.so # << files mainvolume - other changes: -------------- ++++++ pa-0.9.22-cmtspeech-Change-the-retry-interval-for-opening-dev-.patch (new) --- pa-0.9.22-cmtspeech-Change-the-retry-interval-for-opening-dev-.patch +++ pa-0.9.22-cmtspeech-Change-the-retry-interval-for-opening-dev-.patch @@ -0,0 +1,40 @@ +From bcdcac7a8ccd5dca41c3703e47f7b5360006d42d Mon Sep 17 00:00:00 2001 +From: Tanu Kaskinen <[email protected]> +Date: Wed, 3 Oct 2012 13:14:14 +0000 +Subject: [PATCH] cmtspeech: Change the retry interval for opening + /dev/cmt_speech from 0.5 seconds to 60 seconds. + +If the device remains missing for a longer period (perhaps it's not +getting created at all), the error messages spam the log in +a nasty way if the retry interval is small. + +BugLink: https://bugs.nemomobile.org/show_bug.cgi?id=326 +--- + src/cmtspeech/cmtspeech-connection.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/cmtspeech/cmtspeech-connection.c b/src/cmtspeech/cmtspeech-connection.c +index d614627..7236ec7 100644 +--- a/src/cmtspeech/cmtspeech-connection.c ++++ b/src/cmtspeech/cmtspeech-connection.c +@@ -504,7 +504,8 @@ static void thread_func(void *udata) { + int ret; + + if (check_cmtspeech_connection(c)) { +- pa_rtpoll_set_timer_relative(c->rtpoll, 500000); ++ pa_log("Failed to open the cmtspeech device, waiting 60 seconds before trying again."); ++ pa_rtpoll_set_timer_relative(c->rtpoll, 60 * 1000 * 1000); + } + + pollfd_update(c); +@@ -521,7 +522,6 @@ static void thread_func(void *udata) { + + /* note: cmtspeech can be closed in DBus thread */ + if (c->cmtspeech == NULL) { +- pa_log_notice("closing and reopening cmtspeech device"); + continue; + } + +-- +1.7.10.3 + ++++++ pulseaudio-modules-n900.yaml --- pulseaudio-modules-n900.yaml +++ pulseaudio-modules-n900.yaml @@ -14,6 +14,7 @@ - "pa-0.9.22-Insert-PA_LOG_NOTICE-at-param-of-pa_log_ratelim_B.patch" - "pa-0.9.19-mfld-common-updated-parameter-hook-interface.patch" - "pa-0.9.22-remove-flat-volume-for-n900.patch" + - "pa-0.9.22-cmtspeech-Change-the-retry-interval-for-opening-dev-.patch" Description: PulseAudio modules for Nokia N900 handset. ExclusiveArch: "%arm" PkgBR: ++++++ deleted files: --- pa-0.9.22-cmtspeech-connection-alignment-with-new-pa_thread_ne.patch
