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 #16948:
submit:
home:sami.sirkia:branches:devel:multimedia/pulseaudio-modules-n900(r5)(cleanup)
-> devel:multimedia/pulseaudio-modules-n900
Message:
The fix in module-mfld is slightly different, but functionally the same.
The lost line causes N900 pulseaudio to be unstable.
* Tue Apr 26 2011 Sami Sirkia<[email protected]> - 0.9.19.0.11
- Added a change that was lost in cleanup. (BMC#15950)
- Merged the pa-0.9.22-audio-routing-null-pointer-fix.patch
into earlier pa-0.9.22-remove-flat-volume-for-n900.patch
State: new 2011-04-26T07:00:42 sami.sirkia
Comment: None
changes files:
--------------
--- pulseaudio-modules-n900.changes
+++ pulseaudio-modules-n900.changes
@@ -0,0 +1,5 @@
+* Tue Apr 26 2011 Sami Sirkia<[email protected]> - 0.9.19.0.11
+- Added a change that was lost in cleanup. (BMC#15950)
+- Merged the pa-0.9.22-audio-routing-null-pointer-fix.patch
+ into earlier pa-0.9.22-remove-flat-volume-for-n900.patch
+
old:
----
pa-0.9.22-audio-routing-null-pointer-fix.patch
spec files:
-----------
--- pulseaudio-modules-n900.spec
+++ pulseaudio-modules-n900.spec
@@ -21,7 +21,6 @@
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-audio-routing-null-pointer-fix.patch
BuildRequires: pkgconfig(check)
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(pulsecore)
@@ -109,8 +108,6 @@
%patch4 -p1
# pa-0.9.22-remove-flat-volume-for-n900.patch
%patch5 -p1
-# pa-0.9.22-audio-routing-null-pointer-fix.patch
-%patch6 -p1
#>> setup
#<< setup
other changes:
--------------
++++++ pa-0.9.22-remove-flat-volume-for-n900.patch
--- pa-0.9.22-remove-flat-volume-for-n900.patch
+++ pa-0.9.22-remove-flat-volume-for-n900.patch
@@ -188,7 +188,7 @@
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 @@
+@@ -163,7 +163,7 @@
return PA_HOOK_OK;
}
@@ -197,36 +197,13 @@
struct mv_volume_steps_set *set;
pa_proplist *p = NULL;
int ret = 0;
-
-+ pa_assert(ua);
- pa_assert(u);
-
-- if (!u->route)
-- return PA_HOOK_OK;
-+ if (u->route)
-+ pa_xfree(u->route);
-+
-+ u->route = pa_xstrdup(ua->mode);
-+ pa_log_debug("mode changes to %s", u->route);
-
- /* in tuning mode we always update steps when changing
- * x-maemo.mode.
- * First remove tunings in current route, then try to parse
- * normally */
-- if (u->tuning_mode&& ua&& ua->parameters) {
-+ if (u->tuning_mode&& ua->parameters) {
- if ((set = pa_hashmap_remove(u->steps, u->route))) {
- steps_set_free(set, NULL);
- set = NULL;
-@@ -301,8 +305,10 @@
+@@ -301,8 +305,8 @@
dbus_init(u);
- request_parameter_updates("mode", (pa_hook_cb_t)mode_changed_cb,
PA_HOOK_NORMAL, u);
- request_parameter_updates("mainvolume",
(pa_hook_cb_t)parameters_changed_cb, PA_HOOK_NORMAL, u);
-+ // I don't understand this!
-+ //request_parameter_updates("mode", (pa_hook_cb_t)mode_changed_cb,
PA_HOOK_NORMAL, u);
-+ //request_parameter_updates("mainvolume",
(pa_hook_cb_t)parameters_changed_cb, PA_HOOK_NORMAL, u);
++ meego_parameter_request_updates(NULL, (pa_hook_cb_t)mode_changed_cb,
PA_HOOK_NORMAL, TRUE, u);
+ meego_parameter_request_updates("mainvolume",
(pa_hook_cb_t)parameters_changed_cb, PA_HOOK_NORMAL, TRUE, u);
pa_modargs_free(ma);
@@ -668,9 +645,9 @@
pa_sink_set_asyncmsgq(u->raw_sink, u->master_sink->asyncmsgq);
pa_sink_set_rtpoll(u->raw_sink, u->master_sink->thread_info.rtpoll);
diff -ruN a/src/voice/voice-util.c c/src/voice/voice-util.c
---- a/src/voice/voice-util.c 2010-09-15 10:44:14.000000000 +0300
-+++ c/src/voice/voice-util.c 2011-04-11 13:16:59.865077961 +0300
-@@ -357,11 +357,12 @@
+--- a/src/voice/voice-util.c
++++ b/src/voice/voice-util.c
+@@ -357,9 +357,9 @@
return om_source;
}
@@ -678,27 +655,21 @@
- struct userdata *u = (struct userdata*)userdata;
+pa_hook_result_t alsa_parameter_cb(pa_core *c, meego_parameter_update_args
*ua, struct userdata *u) {
pa_proplist *p;
-+ pa_assert(ua);
+ pa_assert(u);
-- if (ua&& ua->parameters) {
-+ if (ua->parameters) {
+ if (ua&& ua->parameters) {
p = pa_proplist_from_string(ua->parameters);
-
- pa_sink_update_proplist(u->master_sink, PA_UPDATE_REPLACE, p);
-@@ -372,23 +373,28 @@
+@@ -372,22 +372,25 @@
return PA_HOOK_OK;
}
-pa_hook_result_t aep_parameter_cb(pa_core *c, struct update_args *ua, void
*userdata) {
- struct userdata *u = (struct userdata*)userdata;
-
-- if (ua&& ua->parameters)
+pa_hook_result_t aep_parameter_cb(pa_core *c, meego_parameter_update_args
*ua, struct userdata *u) {
-+ pa_assert(ua);
+ pa_assert(u);
+
-+ if (ua->parameters)
+ if (ua&& ua->parameters)
voice_aep_ear_ref_loop_reset(u);
return PA_HOOK_OK;
@@ -712,16 +683,13 @@
int temp = 0;
double tempf = 0;
-- if (ua&& ua->parameters) {
+ pa_log_error("voice_parameter_cb");
+
-+ pa_assert(ua);
+ pa_assert(u);
+
-+ if (ua->parameters) {
+ if (ua&& ua->parameters) {
p = pa_proplist_from_string(ua->parameters);
- v = pa_strnull(pa_proplist_gets(p,
PA_NOKIA_PROP_AUDIO_CMT_UL_TIMING_ADVANCE));
diff -ruN a/src/voice/voice-util.h c/src/voice/voice-util.h
--- a/src/voice/voice-util.h 2010-09-15 10:44:14.000000000 +0300
+++ c/src/voice/voice-util.h 2011-04-11 11:04:28.803077998 +0300
++++++ pulseaudio-modules-n900.yaml
--- pulseaudio-modules-n900.yaml
+++ pulseaudio-modules-n900.yaml
@@ -14,7 +14,6 @@
- "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-audio-routing-null-pointer-fix.patch"
Description: PulseAudio modules for Nokia N900 handset.
ExclusiveArch: "%arm"
PkgBR:
++++++ deleted files:
--- pa-0.9.22-audio-routing-null-pointer-fix.patch
_______________________________________________
MeeGo-commits mailing list
[email protected]
http://lists.meego.com/listinfo/meego-commits
