deal with a possibly failing pa_channel_map_init_auto() correctly

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2105 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-02-13 22:13:44 +00:00
parent a3e820fca7
commit 86b9ef8c96
13 changed files with 39 additions and 18 deletions

View file

@ -119,7 +119,10 @@ int pa_sound_file_load(
}
if (map)
pa_channel_map_init_auto(map, ss->channels, PA_CHANNEL_MAP_DEFAULT);
if (!pa_channel_map_init_auto(map, ss->channels, PA_CHANNEL_MAP_DEFAULT)) {
pa_log("Unsupported channel map in file %s", fname);
goto finish;
}
if ((l = pa_frame_size(ss) * sfinfo.frames) > PA_SCACHE_ENTRY_SIZE_MAX) {
pa_log("File too large");