why the version of this is still Version: 0.9.19.0.11 ?
Anas On 13 Apr 2011, at 16:57, Sami Sirkiä wrote: > This is urgent, because it is blocking n900 images. > > thanks, > SSirkia > > On 04/13/2011 10:36 AM, Sami Sirkia wrote: >> Hi, >> I have made the following changes to pulseaudio-modules-n900 in project >> devel:multimedia. Please review and accept ASAP. >> >> Thank You, >> Sami Sirkia >> >> [This message was auto-generated] >> >> --- >> >> Request #16168: >> >> submit: >> home:sami.sirkia:branches:devel:multimedia/pulseaudio-modules-n900(r17)(cleanup) >> -> devel:multimedia/pulseaudio-modules-n900 >> >> >> Message: >> * Wed Apr 13 2011 Sami Sirkia<[email protected]> - 0.9.19.0.11 >> - Added patches to be compatible with PA .22 (BMC#15688) >> Stopped using flat_volume_sink. Most patches copied from modules-mfld. >> >> Fixes package break which is one of the reasons why we have no n900 images. >> Other reasons are in similar closed packages - they will be handled asap. >> >> State: new 2011-04-13T00:36:31 sami.sirkia >> Comment: None >> >> >> >> changes files: >> -------------- >> --- pulseaudio-modules-n900.changes >> +++ pulseaudio-modules-n900.changes >> @@ -0,0 +1,4 @@ >> +* Wed Apr 13 2011 Sami Sirkia<[email protected]> - 0.9.19.0.11 >> +- Added patches to be compatible with PA .22 (BMC#15688) >> + Stopped using flat_volume_sink. Most patches copied from modules-mfld. >> + >> >> new: >> ---- >> pa-0.9.19-mfld-common-updated-parameter-hook-interface.patch >> pa-0.9.22-Insert-PA_LOG_NOTICE-at-param-of-pa_log_ratelim_B.patch >> pa-0.9.22-alignment-with-new-pa_thread_new-for-cmtspeech.patch >> pa-0.9.22-cmtspeech-connection-alignment-with-new-pa_thread_ne.patch >> pa-0.9.22-remove-flat-volume-for-n900.patch >> >> spec files: >> ----------- >> --- pulseaudio-modules-n900.spec >> +++ pulseaudio-modules-n900.spec >> @@ -17,6 +17,10 @@ >> Source100: pulseaudio-modules-n900.yaml >> Patch0: %{name}-include-call-state-tracker_h.patch >> Patch1: %{name}-cmtspeech-ofono.patch >> +Patch2: pa-0.9.22-alignment-with-new-pa_thread_new-for-cmtspeech.patch >> +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 >> BuildRequires: pkgconfig(check) >> BuildRequires: pkgconfig(dbus-1) >> BuildRequires: pkgconfig(pulsecore) >> @@ -96,6 +100,14 @@ >> %patch0 -p1 >> # %{name}-cmtspeech-ofono.patch >> %patch1 -p1 >> +# pa-0.9.22-alignment-with-new-pa_thread_new-for-cmtspeech.patch >> +%patch2 -p1 >> +# pa-0.9.22-Insert-PA_LOG_NOTICE-at-param-of-pa_log_ratelim_B.patch >> +%patch3 -p1 >> +# pa-0.9.19-mfld-common-updated-parameter-hook-interface.patch >> +%patch4 -p1 >> +# pa-0.9.22-remove-flat-volume-for-n900.patch >> +%patch5 -p1 >> #>> setup >> #<< setup >> >> @@ -162,42 +174,42 @@ >> %defattr(-,root,root,-) >> #>> files devel >> %{_includedir}/pulse-modules-headers/modules/meego/* >> -%exclude %{_libdir}/pulse-0.9.19/modules/module-meego-test.so >> +%exclude %{_libdir}/pulse-0.9.22/modules/module-meego-test.so >> #<< files devel >> >> %files common >> %defattr(-,root,root,-) >> #>> files common >> -%{_libdir}/pulse-0.9.19/modules/libmeego-common.so >> +%{_libdir}/pulse-0.9.22/modules/libmeego-common.so >> #<< files common >> >> %files music >> %defattr(-,root,root,-) >> #>> files music >> -%{_libdir}/pulse-0.9.19/modules/module-meego-music.so >> +%{_libdir}/pulse-0.9.22/modules/module-meego-music.so >> #<< files music >> >> %files record >> %defattr(-,root,root,-) >> #>> files record >> -%{_libdir}/pulse-0.9.19/modules/module-meego-record.so >> +%{_libdir}/pulse-0.9.22/modules/module-meego-record.so >> #<< files record >> >> %files voice >> %defattr(-,root,root,-) >> #>> files voice >> -%{_libdir}/pulse-0.9.19/modules/module-meego-voice.so >> +%{_libdir}/pulse-0.9.22/modules/module-meego-voice.so >> #<< files voice >> >> %files cmtspeech >> %defattr(-,root,root,-) >> #>> files cmtspeech >> -%{_libdir}/pulse-0.9.19/modules/module-meego-cmtspeech.so >> +%{_libdir}/pulse-0.9.22/modules/module-meego-cmtspeech.so >> #<< files cmtspeech >> >> %files mainvolume >> %defattr(-,root,root,-) >> #>> files mainvolume >> -%{_libdir}/pulse-0.9.19/modules/module-meego-mainvolume.so >> +%{_libdir}/pulse-0.9.22/modules/module-meego-mainvolume.so >> #<< files mainvolume >> >> >> other changes: >> -------------- >> >> ++++++ pa-0.9.19-mfld-common-updated-parameter-hook-interface.patch (new) >> --- pa-0.9.19-mfld-common-updated-parameter-hook-interface.patch >> +++ pa-0.9.19-mfld-common-updated-parameter-hook-interface.patch >> +From 02f7bde92e93b0588cbba750184e86a22cb4c4ed Mon Sep 17 00:00:00 2001 >> +From: Mael Pouessel<[email protected]> >> +Date: Wed, 26 Jan 2011 15:15:42 +0100 >> +Subject: [PATCH 08/17] common: updated parameter hook interface >> + >> +Signed-off-by: Mael Pouessel<[email protected]> >> +--- >> + src/common/Makefile.am | 2 +- >> + src/common/parameter-hook-implementor.h | 39 +++++++++++++++++++ >> + src/common/parameter-hook.c | 38 +++++++++++-------- >> + src/common/parameter-hook.h | 63 >> +++++++++++++++++++++++++------ >> + 4 files changed, 113 insertions(+), 29 deletions(-) >> + create mode 100644 src/common/parameter-hook-implementor.h >> + >> +diff --git a/src/common/Makefile.am b/src/common/Makefile.am >> +index b7c8ee4..4193298 100644 >> +--- a/src/common/Makefile.am >> ++++ b/src/common/Makefile.am >> +@@ -7,7 +7,7 @@ libmeego_common_la_SOURCES = \ >> + optimized.c optimized.h \ >> + pa-optimized.c pa-optimized.h \ >> + memory.c memory.h \ >> +- parameter-hook.c parameter-hook.h \ >> ++ parameter-hook.c parameter-hook.h parameter-hook-implementor.h \ >> + algorithm-hook.c algorithm-hook.h \ >> + latency-controller.c latency-controller.h \ >> + master-trigger.c master-trigger.h \ >> +diff --git a/src/common/parameter-hook-implementor.h >> b/src/common/parameter-hook-implementor.h >> +new file mode 100644 >> +index 0000000..73e176f >> +--- /dev/null >> ++++ b/src/common/parameter-hook-implementor.h >> +@@ -0,0 +1,39 @@ >> ++/* >> ++ * Copyright (C) 2010 Nokia Corporation. >> ++ * >> ++ * Contact: Maemo MMF Audio<[email protected]> >> ++ * or Jyri Sarha<[email protected]> >> ++ * >> ++ * These PulseAudio Modules are free software; you can redistribute >> ++ * it and/or modify it under the terms of the GNU Lesser General Public >> ++ * License as published by the Free Software Foundation >> ++ * version 2.1 of the License. >> ++ * >> ++ * This library is distributed in the hope that it will be useful, >> ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of >> ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >> ++ * Lesser General Public License for more details. >> ++ * >> ++ * You should have received a copy of the GNU Lesser General Public >> ++ * License along with this library; if not, write to the Free Software >> ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 >> ++ * USA. >> ++ */ >> ++#ifndef _parameter_hook_implementor_h_ >> ++#define _parameter_hook_implementor_h_ >> ++ >> ++#include "parameter-hook.h" >> ++ >> ++typedef struct meego_parameter_connection_args { >> ++ const char *name; >> ++ pa_hook_cb_t cb; >> ++ pa_hook_priority_t prio; >> ++ pa_bool_t full_updates; >> ++ void *userdata; >> ++} meego_parameter_connection_args; >> ++ >> ++pa_hook_slot* meego_parameter_receive_update_requests(pa_core *c, >> pa_hook_cb_t cb, void *userdata); >> ++void meego_parameter_discontinue_update_requests(pa_hook_slot *slot); >> ++ >> ++ >> ++#endif >> +diff --git a/src/common/parameter-hook.c b/src/common/parameter-hook.c >> +index fbf40f9..0b05500 100644 >> +--- a/src/common/parameter-hook.c >> ++++ b/src/common/parameter-hook.c >> +@@ -24,16 +24,21 @@ >> + #include<config.h> >> + #endif >> + >> ++#include<pulsecore/core.h> >> + #include<pulsecore/hook-list.h> >> + >> + #include "parameter-hook.h" >> ++#include "parameter-hook-implementor.h" >> + >> +-static pa_hook *parameter_update_requests = NULL; >> ++static pa_hook parameter_update_requests; >> ++static pa_hook *parameter_update_requests_ptr = NULL; >> + >> +-int request_parameter_updates(const char *name, pa_hook_cb_t cb, >> pa_hook_priority_t prio, void *u) { >> +- struct connect_args args; >> ++int meego_parameter_request_updates(const char *name, pa_hook_cb_t cb, >> pa_hook_priority_t prio, pa_bool_t full_updates, void *userdata) { >> ++ meego_parameter_connection_args args; >> + >> +- if (!parameter_update_requests) { >> ++ pa_assert(cb); >> ++ >> ++ if (!parameter_update_requests_ptr) { >> + pa_log_warn("Parameter update service not available"); >> + return -1; >> + } >> +@@ -41,25 +46,26 @@ int request_parameter_updates(const char *name, >> pa_hook_cb_t cb, pa_hook_priorit >> + args.name = name; >> + args.cb = cb; >> + args.prio = prio; >> +- args.u = u; >> +- >> +- pa_log_warn("Requesting updates for %s", name); >> ++ args.full_updates = full_updates; >> ++ args.userdata = userdata; >> ++ >> ++ pa_log_debug("Requesting updates for %s", name ? name : "mode >> changes"); >> + >> +- pa_hook_fire(parameter_update_requests,&args); >> ++ pa_hook_fire(parameter_update_requests_ptr,&args); >> + >> + return 0; >> + } >> + >> +-pa_hook_slot *receive_update_requests(pa_hook_cb_t cb, void *p) { >> +- if (!parameter_update_requests) { >> +- parameter_update_requests = pa_xnew0(pa_hook, 1); >> +- pa_hook_init(parameter_update_requests, p); >> ++pa_hook_slot* meego_parameter_receive_update_requests(pa_core *c, >> pa_hook_cb_t cb, void *userdata) { >> ++ if (!parameter_update_requests_ptr) { >> ++ parameter_update_requests_ptr =¶meter_update_requests; >> ++ pa_hook_init(parameter_update_requests_ptr, c); >> + } >> + >> +- return pa_hook_connect(parameter_update_requests, PA_HOOK_NORMAL, cb, >> p); >> ++ return pa_hook_connect(parameter_update_requests_ptr, PA_HOOK_NORMAL, >> cb, userdata); >> + } >> + >> +-void discontinue_update_requests(pa_hook_slot *s) { >> +- pa_hook_slot_free(s); >> ++void meego_parameter_discontinue_update_requests(pa_hook_slot *slot) { >> ++ pa_hook_slot_free(slot); >> ++ parameter_update_requests_ptr = NULL; >> + } >> +- >> +diff --git a/src/common/parameter-hook.h b/src/common/parameter-hook.h >> +index c5c9598..8fc9829 100644 >> +--- a/src/common/parameter-hook.h >> ++++ b/src/common/parameter-hook.h >> +@@ -22,20 +22,59 @@ >> + #ifndef _parameter_hook_h_ >> + #define _parameter_hook_h_ >> + >> +-struct connect_args { >> +- const char *name; >> +- pa_hook_cb_t cb; >> +- pa_hook_priority_t prio; >> +- void *u; >> +-}; >> ++typedef enum meego_parameter_status { >> ++ MEEGO_PARAM_ENABLE, >> ++ MEEGO_PARAM_DISABLE, >> ++ MEEGO_PARAM_UPDATE, >> ++ MEEGO_PARAM_MODE_CHANGE >> ++} meego_parameter_status_t; >> + >> +-struct update_args { >> +- void *parameters; >> ++/* >> ++ * Parameter updates are received in pa_hook_cb_t. >> ++ * hook_data is pointer to pa_core. >> ++ * call_data is pointer to meego_parameter_update_args explained below. >> ++ * slot_data is pointer to userdata given in >> meego_parameter_request_updates(). >> ++ * >> ++ * mode >> ++ * Null-terminated string of current audio mode. >> ++ * >> ++ * status MEEGO_PARAM_ENABLE: >> ++ * Parameters for given mode are already loaded, but mode >> ++ * changes to one with parameter. >> ++ * parameters and length are set to current parameter. >> ++ * >> ++ * status MEEGO_PARAM_DISABLE: >> ++ * Parameters are disabled for current mode, that is, no >> ++ * parameter are defined. >> ++ * parameters is NULL and length 0. >> ++ * >> ++ * status MEEGO_PARAM_UPDATE: >> ++ * Parameters for mode have changed from previous values. This >> ++ * also implies Enable. >> ++ * parameters and length are set to updated parameter. >> ++ * >> ++ * status MEEGO_PARAM_MODE_CHANGE: >> ++ * Mode has changed, but parameter state has not changed, that >> ++ * is, if status was disabled it is still so. This status >> ++ * is received only if full_updates was TRUE in connection. >> ++ * parameters and length are set to currently active parameters. >> ++ * This status is also always set if only mode changes >> ++ * are requested. In that case parameters is NULL and length 0. >> ++ * >> ++ * Hook callback should always return PA_HOOK_OK. >> ++ */ >> (22 more lines skipped) >> >> ++++++ pa-0.9.22-Insert-PA_LOG_NOTICE-at-param-of-pa_log_ratelim_B.patch >> (new) >> --- pa-0.9.22-Insert-PA_LOG_NOTICE-at-param-of-pa_log_ratelim_B.patch >> +++ pa-0.9.22-Insert-PA_LOG_NOTICE-at-param-of-pa_log_ratelim_B.patch >> +diff --git a/src/cmtspeech/cmtspeech-sink-input.c >> b/src/cmtspeech/cmtspeech-sink-input.c >> +index 4650531..a27a156 100644 >> +--- a/src/cmtspeech/cmtspeech-sink-input.c >> ++++ b/src/cmtspeech/cmtspeech-sink-input.c >> +@@ -177,7 +177,7 @@ static int cmtspeech_sink_input_pop_cb(pa_sink_input >> *i, size_t length, pa_memch >> + cmtspeech_dl_sideinfo_forward(u); >> + } >> + else { >> +- if (u->cmt_connection.first_dl_frame_received&& >> pa_log_ratelimit()) >> ++ if (u->cmt_connection.first_dl_frame_received&& >> pa_log_ratelimit(PA_LOG_NOTICE)) >> + pa_log_debug("No DL audio: %d bytes in queue %d needed", >> + pa_memblockq_get_length(u->dl_memblockq), >> u->dl_frame_size); >> + cmtspeech_dl_sideinfo_bogus(u); >> +-- >> +1.7.2.3 >> + >> >> ++++++ pa-0.9.22-alignment-with-new-pa_thread_new-for-cmtspeech.patch (new) >> --- pa-0.9.22-alignment-with-new-pa_thread_new-for-cmtspeech.patch >> +++ pa-0.9.22-alignment-with-new-pa_thread_new-for-cmtspeech.patch >> +From 1bf2d24978e1c11f8c0f370d853d6d33fbcb9e36 Mon Sep 17 00:00:00 2001 >> +From: FBarthes<[email protected]> >> +Date: Wed, 6 Apr 2011 10:48:23 +0200 >> +Subject: [PATCH] alignment with new pa_thread_new for cmtspeech >> + >> +--- >> + src/cmtspeech/cmtspeech-connection.c | 2 +- >> + 1 files changed, 1 insertions(+), 1 deletions(-) >> + >> +diff --git a/src/cmtspeech/cmtspeech-connection.c >> b/src/cmtspeech/cmtspeech-connection.c >> +index 6069605..8a554ed 100644 >> +--- a/src/cmtspeech/cmtspeech-connection.c >> ++++ b/src/cmtspeech/cmtspeech-connection.c >> +@@ -597,7 +597,7 @@ int cmtspeech_connection_init(struct userdata *u) >> + c->record_running = FALSE; >> + c->playback_running = FALSE; >> + >> +- if (!(c->thread = pa_thread_new(thread_func, u))) { >> ++ if (!(c->thread = pa_thread_new("cmtspeech",thread_func, u))) { >> + pa_log_error("Failed to create thread."); >> + pa_atomic_store(&c->thread_state, CMT_QUIT); >> + cmtspeech_connection_unload(u); >> +-- >> +1.7.2.3 >> + >> >> ++++++ pa-0.9.22-cmtspeech-connection-alignment-with-new-pa_thread_ne.patch >> (new) >> --- pa-0.9.22-cmtspeech-connection-alignment-with-new-pa_thread_ne.patch >> +++ pa-0.9.22-cmtspeech-connection-alignment-with-new-pa_thread_ne.patch >> +From 77d344f72715badcdfbc2d5106b783b8b193fe64 Mon Sep 17 00:00:00 2001 >> +From: Mael Pouessel<[email protected]> >> +Date: Tue, 5 Apr 2011 10:54:55 +0200 >> +Subject: [PATCH 23/28] cmtspeech-connection: alignment with new >> pa_thread_new API >> + Signed-off-by: Mael Pouessel<[email protected]> >> + >> +--- >> + src/cmtspeech-ifx/cmtspeech-connection.c | 2 +- >> + 1 files changed, 1 insertions(+), 1 deletions(-) >> + >> +diff --git a/src/cmtspeech-ifx/cmtspeech-connection.c >> b/src/cmtspeech-ifx/cmtspeech-connection.c >> +index 7d03437..4e76ff3 100644 >> +--- a/src/cmtspeech-ifx/cmtspeech-connection.c >> ++++ b/src/cmtspeech-ifx/cmtspeech-connection.c >> +@@ -642,7 +642,7 @@ int cmtspeech_connection_init(struct userdata *u) >> + c->ul_prepare_time_usec = DEFAULT_PROCESSING_TIME_USEC; >> + c->adjust_time_usec = 0; >> + >> +- if (!(c->thread = pa_thread_new(thread_func, u))) { >> ++ if (!(c->thread = pa_thread_new("cmtspeech",thread_func, u))) { >> + pa_log_error("Failed to create thread."); >> + pa_atomic_store(&c->thread_state, CMT_QUIT); >> + cmtspeech_connection_unload(u); >> +-- >> +1.7.2.3 >> + >> >> ++++++ pa-0.9.22-remove-flat-volume-for-n900.patch (new) >> --- pa-0.9.22-remove-flat-volume-for-n900.patch >> +++ pa-0.9.22-remove-flat-volume-for-n900.patch >> +diff -ruN a/bootstrap.sh c/bootstrap.sh >> +--- a/bootstrap.sh 2010-09-15 10:44:14.000000000 +0300 >> ++++ c/bootstrap.sh 2011-04-11 10:19:22.241078002 +0300 >> +@@ -9,6 +9,6 @@ >> + export CFLAGS=${CFLAGS-"-g -O0"} >> + >> + if test "x$NOCONFIGURE" = "x"; then >> +- ./configure --enable-maintainer-mode --disable-processing >> --enable-shave "$@" >> ++ ./configure --disable-processing --enable-shave "$@" >> + make clean >> + fi >> +diff -ruN a/configure.ac c/configure.ac >> +--- a/configure.ac 2010-09-15 10:44:14.000000000 +0300 >> ++++ c/configure.ac 2011-04-11 10:19:22.241078002 +0300 >> +@@ -2,7 +2,7 @@ >> + >> + m4_define(PA_MAJOR, [0]) >> + m4_define(PA_MINOR, [9]) >> +-m4_define(PA_MICRO, [19]) >> ++m4_define(PA_MICRO, [22]) >> + >> + AC_INIT([pulseaudio-meego], [PA_MAJOR.PA_MINOR.PA_MICRO.0], >> [[email protected]]) >> + AC_CONFIG_HEADER([config.h]) >> +diff -ruN a/src/common/src-16-to-48.c c/src/common/src-16-to-48.c >> +--- a/src/common/src-16-to-48.c 2010-09-15 10:44:14.000000000 +0300 >> ++++ c/src/common/src-16-to-48.c 2011-04-11 10:19:22.242078001 +0300 >> +@@ -1,16 +1,24 @@ >> + /* >> +- >> +-Copyright (C) 2008, 2009 Nokia Corporation. >> +-This material, including documentation and any related >> +-computer programs, is protected by copyright controlled by >> +-Nokia Corporation. All rights are reserved. Copying, >> +-including reproducing, storing, adapting or translating, any >> +-or all of this material requires the prior written consent of >> +-Nokia Corporation. This material also contains confidential >> +-information which may not be disclosed to others without the >> +-prior written consent of Nokia Corporation. >> +- >> +-*/ >> ++ * Copyright (C) 2010 Nokia Corporation. >> ++ * >> ++ * Contact: Maemo MMF Audio<[email protected]> >> ++ * or Jaska Uimonen<[email protected]> >> ++ * >> ++ * PulseAudio Meego modules are free software; you can redistribute >> ++ * them and/or modify them under the terms of the GNU Lesser General Public >> ++ * License as published by the Free Software Foundation >> ++ * version 2.1 of the License. >> ++ * >> ++ * This library is distributed in the hope that it will be useful, >> ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of >> ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >> ++ * Lesser General Public License for more details. >> ++ * >> ++ * You should have received a copy of the GNU Lesser General Public >> ++ * License along with this library; if not, write to the Free Software >> ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 >> ++ * USA. >> ++ */ >> + >> + #include<string.h> >> + #include<stdlib.h> >> +diff -ruN a/src/common/src-16-to-48.h c/src/common/src-16-to-48.h >> +--- a/src/common/src-16-to-48.h 2010-09-15 10:44:14.000000000 +0300 >> ++++ c/src/common/src-16-to-48.h 2011-04-11 10:19:22.242078001 +0300 >> +@@ -2,18 +2,26 @@ >> + #define __SRC_16_TO_48_H__ >> + >> + /* >> +- >> +-Copyright (C) 2008, 2009 Nokia Corporation. >> +-This material, including documentation and any related >> +-computer programs, is protected by copyright controlled by >> +-Nokia Corporation. All rights are reserved. Copying, >> +-including reproducing, storing, adapting or translating, any >> +-or all of this material requires the prior written consent of >> +-Nokia Corporation. This material also contains confidential >> +-information which may not be disclosed to others without the >> +-prior written consent of Nokia Corporation. >> +- >> +-*/ >> ++ * Copyright (C) 2010 Nokia Corporation. >> ++ * >> ++ * Contact: Maemo MMF Audio<[email protected]> >> ++ * or Jaska Uimonen<[email protected]> >> ++ * >> ++ * PulseAudio Meego modules are free software; you can redistribute >> ++ * them and/or modify them under the terms of the GNU Lesser General Public >> ++ * License as published by the Free Software Foundation >> ++ * version 2.1 of the License. >> ++ * >> ++ * This library is distributed in the hope that it will be useful, >> ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of >> ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >> ++ * Lesser General Public License for more details. >> ++ * >> ++ * You should have received a copy of the GNU Lesser General Public >> ++ * License along with this library; if not, write to the Free Software >> ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 >> ++ * USA. >> ++ */ >> + >> + /* 320 frames equals 20ms */ >> + #define SRC_16_TO_48_MAX_INPUT_FRAMES 320 >> +diff -ruN a/src/common/src-48-to-16.c c/src/common/src-48-to-16.c >> +--- a/src/common/src-48-to-16.c 2010-09-15 10:44:14.000000000 +0300 >> ++++ c/src/common/src-48-to-16.c 2011-04-11 10:19:22.242078001 +0300 >> +@@ -1,16 +1,24 @@ >> + /* >> +- >> +-Copyright (C) 2008, 2009 Nokia Corporation. >> +-This material, including documentation and any related >> +-computer programs, is protected by copyright controlled by >> +-Nokia Corporation. All rights are reserved. Copying, >> +-including reproducing, storing, adapting or translating, any >> +-or all of this material requires the prior written consent of >> +-Nokia Corporation. This material also contains confidential >> +-information which may not be disclosed to others without the >> +-prior written consent of Nokia Corporation. >> +- >> +-*/ >> ++ * Copyright (C) 2010 Nokia Corporation. >> ++ * >> ++ * Contact: Maemo MMF Audio<[email protected]> >> ++ * or Jaska Uimonen<[email protected]> >> ++ * >> ++ * PulseAudio Meego modules are free software; you can redistribute >> ++ * them and/or modify them under the terms of the GNU Lesser General Public >> ++ * License as published by the Free Software Foundation >> ++ * version 2.1 of the License. >> ++ * >> ++ * This library is distributed in the hope that it will be useful, >> ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of >> ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >> ++ * Lesser General Public License for more details. >> ++ * >> ++ * You should have received a copy of the GNU Lesser General Public >> ++ * License along with this library; if not, write to the Free Software >> ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 >> ++ * USA. >> ++ */ >> + >> + #include<stdio.h> >> + >> +diff -ruN a/src/common/src-48-to-16.h c/src/common/src-48-to-16.h >> +--- a/src/common/src-48-to-16.h 2010-09-15 10:44:14.000000000 +0300 >> ++++ c/src/common/src-48-to-16.h 2011-04-11 10:19:22.243078000 +0300 >> +@@ -2,18 +2,26 @@ >> + #define __SRC_48_TO_16_H__ >> + >> + /* >> +- >> +-Copyright (C) 2008, 2009 Nokia Corporation. >> +-This material, including documentation and any related >> +-computer programs, is protected by copyright controlled by >> +-Nokia Corporation. All rights are reserved. Copying, >> +-including reproducing, storing, adapting or translating, any >> +-or all of this material requires the prior written consent of >> +-Nokia Corporation. This material also contains confidential >> +-information which may not be disclosed to others without the >> +-prior written consent of Nokia Corporation. >> +- >> +-*/ >> ++ * Copyright (C) 2010 Nokia Corporation. >> ++ * >> ++ * Contact: Maemo MMF Audio<[email protected]> >> ++ * or Jaska Uimonen<[email protected]> >> ++ * >> ++ * PulseAudio Meego modules are free software; you can redistribute >> ++ * them and/or modify them under the terms of the GNU Lesser General Public >> ++ * License as published by the Free Software Foundation >> ++ * version 2.1 of the License. >> ++ * >> ++ * This library is distributed in the hope that it will be useful, >> ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of >> ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >> ++ * Lesser General Public License for more details. >> ++ * >> ++ * You should have received a copy of the GNU Lesser General Public >> ++ * License along with this library; if not, write to the Free Software >> ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 >> ++ * USA. >> ++ */ >> + >> + #define SRC_48_TO_16_MAX_INPUT_FRAMES 960 >> + >> +diff -ruN a/src/mainvolume/module-meego-mainvolume.c >> c/src/mainvolume/module-meego-mainvolume.c >> +--- a/src/mainvolume/module-meego-mainvolume.c 2010-09-15 >> 10:44:14.000000000 +0300 >> ++++ c/src/mainvolume/module-meego-mainvolume.c 2011-04-11 >> 14:33:21.034078010 +0300 >> +@@ -163,21 +163,25 @@ >> + return PA_HOOK_OK; >> + } >> + >> +-static pa_hook_result_t parameters_changed_cb(pa_core *c, struct >> update_args *ua, struct mv_userdata *u) { >> ++static pa_hook_result_t parameters_changed_cb(pa_core *c, >> meego_parameter_update_args *ua, struct mv_userdata *u) { >> + struct mv_volume_steps_set *set; >> + pa_proplist *p = NULL; >> (576 more lines skipped) >> >> ++++++ pulseaudio-modules-n900.yaml >> --- pulseaudio-modules-n900.yaml >> +++ pulseaudio-modules-n900.yaml >> @@ -10,6 +10,10 @@ >> Patches: >> - "%{name}-include-call-state-tracker_h.patch" >> - "%{name}-cmtspeech-ofono.patch" >> + - "pa-0.9.22-alignment-with-new-pa_thread_new-for-cmtspeech.patch" >> + - "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" >> Description: PulseAudio modules for Nokia N900 handset. >> ExclusiveArch: "%arm" >> PkgBR: >> >> _______________________________________________ >> MeeGo-commits mailing list >> [email protected] >> http://lists.meego.com/listinfo/meego-commits >> > > _______________________________________________ > MeeGo-packaging mailing list > [email protected] > http://lists.meego.com/listinfo/meego-packaging _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
