X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-profile-core%2Frecipes-multimedia%2Fpulseaudio%2Fpulseaudio-12.2%2F0002-volume-ramp-additions-to-the-low-level-infra.patch;fp=meta-agl-profile-core%2Frecipes-multimedia%2Fpulseaudio%2Fpulseaudio-10.0%2F0002-volume-ramp-additions-to-the-low-level-infra.patch;h=5b2da69c98be01910c0eb762f0e0d213518e9e2e;hb=7faccb97d69c7581e338f88ce3a2153cdd69fd16;hp=9cee6f5de4e71adaa99aeb54814c9d71bca149cc;hpb=e978a20f40916eac57a5e1af8f65b6ed9f719e50;p=AGL%2Fmeta-agl.git diff --git a/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio-10.0/0002-volume-ramp-additions-to-the-low-level-infra.patch b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio-12.2/0002-volume-ramp-additions-to-the-low-level-infra.patch similarity index 96% rename from meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio-10.0/0002-volume-ramp-additions-to-the-low-level-infra.patch rename to meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio-12.2/0002-volume-ramp-additions-to-the-low-level-infra.patch index 9cee6f5de..5b2da69c9 100644 --- a/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio-10.0/0002-volume-ramp-additions-to-the-low-level-infra.patch +++ b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio-12.2/0002-volume-ramp-additions-to-the-low-level-infra.patch @@ -1,4 +1,4 @@ -From 7757059ffc6e63ea20ba9013682d72d619e7aefc Mon Sep 17 00:00:00 2001 +From c28b5faa6745b525c11d1f54d8bf52386a90fcc1 Mon Sep 17 00:00:00 2001 From: Sangchul Lee Date: Sat, 27 Aug 2016 21:33:16 +0900 Subject: [PATCH 2/6] volume ramp: additions to the low level infra @@ -8,6 +8,7 @@ The original patch is - by Jaska Uimonen helsinki.fi> Signed-off-by: Sangchul Lee + --- src/map-file | 4 + src/pulse/def.h | 13 ++- @@ -18,7 +19,7 @@ Signed-off-by: Sangchul Lee 6 files changed, 459 insertions(+), 2 deletions(-) diff --git a/src/map-file b/src/map-file -index 93a62b8..ef9b57d 100644 +index 9b6cba2..946ab54 100644 --- a/src/map-file +++ b/src/map-file @@ -138,6 +138,10 @@ pa_cvolume_max_mask; @@ -33,10 +34,10 @@ index 93a62b8..ef9b57d 100644 pa_cvolume_scale; pa_cvolume_scale_mask; diff --git a/src/pulse/def.h b/src/pulse/def.h -index 680bdc9..bc3cedd 100644 +index 100df5b..b13eed7 100644 --- a/src/pulse/def.h +++ b/src/pulse/def.h -@@ -347,11 +347,15 @@ typedef enum pa_stream_flags { +@@ -349,11 +349,15 @@ typedef enum pa_stream_flags { * consider absolute when the sink is in flat volume mode, * relative otherwise. \since 0.9.20 */ @@ -53,7 +54,7 @@ index 680bdc9..bc3cedd 100644 } pa_stream_flags_t; /** \cond fulldocs */ -@@ -380,6 +384,7 @@ typedef enum pa_stream_flags { +@@ -382,6 +386,7 @@ typedef enum pa_stream_flags { #define PA_STREAM_FAIL_ON_SUSPEND PA_STREAM_FAIL_ON_SUSPEND #define PA_STREAM_RELATIVE_VOLUME PA_STREAM_RELATIVE_VOLUME #define PA_STREAM_PASSTHROUGH PA_STREAM_PASSTHROUGH @@ -61,7 +62,7 @@ index 680bdc9..bc3cedd 100644 /** \endcond */ -@@ -1047,6 +1052,12 @@ typedef enum pa_port_available { +@@ -1070,6 +1075,12 @@ typedef enum pa_port_available { /** \endcond */ #endif @@ -75,10 +76,10 @@ index 680bdc9..bc3cedd 100644 #endif diff --git a/src/pulse/volume.c b/src/pulse/volume.c -index 1667b94..85072c1 100644 +index ead5415..83a1e05 100644 --- a/src/pulse/volume.c +++ b/src/pulse/volume.c -@@ -445,7 +445,10 @@ int pa_cvolume_channels_equal_to(const pa_cvolume *a, pa_volume_t v) { +@@ -457,7 +457,10 @@ int pa_cvolume_channels_equal_to(const pa_cvolume *a, pa_volume_t v) { unsigned c; pa_assert(a); @@ -90,7 +91,7 @@ index 1667b94..85072c1 100644 pa_return_val_if_fail(PA_VOLUME_IS_VALID(v), 0); for (c = 0; c < a->channels; c++) -@@ -977,3 +980,72 @@ pa_cvolume* pa_cvolume_dec(pa_cvolume *v, pa_volume_t dec) { +@@ -989,3 +992,72 @@ pa_cvolume* pa_cvolume_dec(pa_cvolume *v, pa_volume_t dec) { return pa_cvolume_scale(v, m); } @@ -164,11 +165,11 @@ index 1667b94..85072c1 100644 + return ramp; +} diff --git a/src/pulse/volume.h b/src/pulse/volume.h -index 8cf4fa4..2ae3451 100644 +index 2503c3f..0b74833 100644 --- a/src/pulse/volume.h +++ b/src/pulse/volume.h -@@ -431,6 +431,39 @@ pa_cvolume* pa_cvolume_inc(pa_cvolume *v, pa_volume_t inc); - * the channels are kept. \since 0.9.16 */ +@@ -437,6 +437,39 @@ pa_cvolume* pa_cvolume_inc(pa_cvolume *v, pa_volume_t inc); + * the channels are kept. Returns \a v, or NULL on error. \since 0.9.16 */ pa_cvolume* pa_cvolume_dec(pa_cvolume *v, pa_volume_t dec); +/** Volume ramp type @@ -561,6 +562,3 @@ index 8102bcd..0f86b6f 100644 + pa_cvolume_ramp_int *ramp); + #endif --- -1.9.1 -