[pulseaudio-discuss] [PATCH] module-stream-restore: use entry_write when filling up the database

[David Henningsson]

Hi Ricardo and thanks for the patch,

Could you give some context - is this just a refactoring patch?

Because there is launchpad bug [1], and the suspicious text "Temporarily 
disabling fallback table as that can get pulse in a crash loop without 
the fix available in pulseaudio 1:4.0-0ubuntu21" but there is no 
1:4.0-0ubuntu21 version of PulseAudio anywhere I can find...

On 2014-10-02 01:07, Ricardo Salveti de Araujo wrote:
> From: Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>
>
> Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>
> ---
>   src/modules/module-stream-restore.c | 9 +--------
>   1 file changed, 1 insertion(+), 8 deletions(-)
>
> diff --git a/src/modules/module-stream-restore.c b/src/modules/module-stream-restore.c
> index 38d6aac..06ab543 100644
> --- a/src/modules/module-stream-restore.c
> +++ b/src/modules/module-stream-restore.c
> @@ -1831,7 +1831,6 @@ static int fill_db(struct userdata *u, const char *filename) {
>           *d = 0;
>           if (pa_atod(v, &db) >= 0) {
>               if (db <= 0.0) {
> -                pa_datum key, data;
>                   struct entry e;
>
>                   pa_zero(e);
> @@ -1840,13 +1839,7 @@ static int fill_db(struct userdata *u, const char *filename) {
>                   pa_cvolume_set(&e.volume, 1, pa_sw_volume_from_dB(db));
>                   pa_channel_map_init_mono(&e.channel_map);
>
> -                key.data = (void *) ln;
> -                key.size = strlen(ln);
> -
> -                data.data = (void *) &e;
> -                data.size = sizeof(e);
> -
> -                if (pa_database_set(u->database, &key, &data, false) == 0)
> +                if (entry_write(u, ln, &e, false))
>                       pa_log_debug("Setting %s to %0.2f dB.", ln, db);
>               } else
>                   pa_log_warn("[%s:%u] Positive dB values are not allowed, not setting entry %s.", fn, n, ln);
>

-- 
David Henningsson, Canonical Ltd.
https://launchpad.net/~diwic

[1] https://bugs.launchpad.net/ubuntu/+source/pulseaudio/+bug/1366819