diff options
| -rw-r--r-- | src/polypcore/core-scache.c | 7 | ||||
| -rw-r--r-- | src/polypcore/sound-file.c | 5 | ||||
| -rw-r--r-- | src/polypcore/sound-file.h | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/src/polypcore/core-scache.c b/src/polypcore/core-scache.c index 394bdab4..6632a171 100644 --- a/src/polypcore/core-scache.c +++ b/src/polypcore/core-scache.c @@ -157,6 +157,7 @@ int pa_scache_add_item(pa_core *c, const char *name, const pa_sample_spec *ss, c int pa_scache_add_file(pa_core *c, const char *name, const char *filename, uint32_t *idx) { pa_sample_spec ss; + pa_channel_map map; pa_memchunk chunk; int r; @@ -167,10 +168,10 @@ int pa_scache_add_file(pa_core *c, const char *name, const char *filename, uint3 filename = buf; #endif - if (pa_sound_file_load(filename, &ss, &chunk, c->memblock_stat) < 0) + if (pa_sound_file_load(filename, &ss, &map, &chunk, c->memblock_stat) < 0) return -1; - r = pa_scache_add_item(c, name, &ss, NULL, &chunk, idx); + r = pa_scache_add_item(c, name, &ss, &map, &chunk, idx); pa_memblock_unref(chunk.memblock); return r; @@ -252,7 +253,7 @@ int pa_scache_play_item(pa_core *c, const char *name, pa_sink *sink, const pa_cv return -1; if (e->lazy && !e->memchunk.memblock) { - if (pa_sound_file_load(e->filename, &e->sample_spec, &e->memchunk, c->memblock_stat) < 0) + if (pa_sound_file_load(e->filename, &e->sample_spec, &e->channel_map, &e->memchunk, c->memblock_stat) < 0) return -1; pa_subscription_post(c, PA_SUBSCRIPTION_EVENT_SAMPLE_CACHE|PA_SUBSCRIPTION_EVENT_CHANGE, e->index); diff --git a/src/polypcore/sound-file.c b/src/polypcore/sound-file.c index d86141ce..7a4ef075 100644 --- a/src/polypcore/sound-file.c +++ b/src/polypcore/sound-file.c @@ -35,7 +35,7 @@ #define MAX_FILE_SIZE (1024*1024) -int pa_sound_file_load(const char *fname, pa_sample_spec *ss, pa_memchunk *chunk, pa_memblock_stat *s) { +int pa_sound_file_load(const char *fname, pa_sample_spec *ss, pa_channel_map *map, pa_memchunk *chunk, pa_memblock_stat *s) { SNDFILE*sf = NULL; SF_INFO sfinfo; int ret = -1; @@ -74,6 +74,9 @@ int pa_sound_file_load(const char *fname, pa_sample_spec *ss, pa_memchunk *chunk pa_log(__FILE__": Unsupported sample format in file %s", fname); goto finish; } + + if (map) + pa_channel_map_init_auto(map, ss->channels); if ((l = pa_frame_size(ss)*sfinfo.frames) > MAX_FILE_SIZE) { pa_log(__FILE__": File too large"); diff --git a/src/polypcore/sound-file.h b/src/polypcore/sound-file.h index ffa551b5..9d687f90 100644 --- a/src/polypcore/sound-file.h +++ b/src/polypcore/sound-file.h @@ -23,9 +23,10 @@ ***/ #include <polyp/sample.h> +#include <polyp/channelmap.h> #include <polypcore/memchunk.h> -int pa_sound_file_load(const char *fname, pa_sample_spec *ss, pa_memchunk *chunk, pa_memblock_stat *s); +int pa_sound_file_load(const char *fname, pa_sample_spec *ss, pa_channel_map *map, pa_memchunk *chunk, pa_memblock_stat *s); int pa_sound_file_too_big_to_cache(const char *fname); |