mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-22 08:56:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

allow - in sample names

Browse source
This commit is contained in:
Lennart Poettering 2008-10-03 19:49:15 +02:00
parent 28af9944fe
commit c0815deb4a
2 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/pulsecore/core-scache.c
View file

@ -98,7 +98,7 @@ static pa_scache_entry* scache_add_item(pa_core *c, const char *name) {
pa_assert(c); pa_assert(c);
pa_assert(name); pa_assert(name);
if ((e = pa_namereg_get(c, name, PA_NAMEREG_SAMPLE, 0))) { if ((e = pa_namereg_get(c, name, PA_NAMEREG_SAMPLE, FALSE))) {
if (e->memchunk.memblock) if (e->memchunk.memblock)
pa_memblock_unref(e->memchunk.memblock); pa_memblock_unref(e->memchunk.memblock);
@ -111,7 +111,7 @@ static pa_scache_entry* scache_add_item(pa_core *c, const char *name) {
} else { } else {
e = pa_xnew(pa_scache_entry, 1); e = pa_xnew(pa_scache_entry, 1);
if (!pa_namereg_register(c, name, PA_NAMEREG_SAMPLE, e, 1)) { if (!pa_namereg_register(c, name, PA_NAMEREG_SAMPLE, e, TRUE)) {
pa_xfree(e); pa_xfree(e);
return NULL; return NULL;
} }
@ -134,9 +134,9 @@ static pa_scache_entry* scache_add_item(pa_core *c, const char *name) {
e->lazy = FALSE; e->lazy = FALSE;
e->last_used_time = 0; e->last_used_time = 0;
memset(&e->sample_spec, 0, sizeof(e->sample_spec)); pa_sample_spec_init(&e->sample_spec);
pa_channel_map_init(&e->channel_map); pa_channel_map_init(&e->channel_map);
pa_cvolume_reset(&e->volume, PA_CHANNELS_MAX); pa_cvolume_init(&e->volume);
pa_proplist_sets(e->proplist, PA_PROP_MEDIA_ROLE, "event"); pa_proplist_sets(e->proplist, PA_PROP_MEDIA_ROLE, "event");
@ -159,10 +159,12 @@ int pa_scache_add_item(
pa_assert(c); pa_assert(c);
pa_assert(name); pa_assert(name);
pa_assert(!ss || pa_sample_spec_valid(ss)); pa_assert(!ss || pa_sample_spec_valid(ss));
pa_assert(!map || (pa_channel_map_valid(map) && ss && ss->channels == map->channels)); pa_assert(!map || (pa_channel_map_valid(map) && ss && pa_channel_map_compatible(map, ss)));
if (ss && !map) if (ss && !map) {
pa_channel_map_init_extend(&tmap, ss->channels, PA_CHANNEL_MAP_DEFAULT); pa_channel_map_init_extend(&tmap, ss->channels, PA_CHANNEL_MAP_DEFAULT);
map = &tmap;
}
if (chunk && chunk->length > PA_SCACHE_ENTRY_SIZE_MAX) if (chunk && chunk->length > PA_SCACHE_ENTRY_SIZE_MAX)
return -1; return -1;
@ -170,12 +172,13 @@ int pa_scache_add_item(
if (!(e = scache_add_item(c, name))) if (!(e = scache_add_item(c, name)))
return -1; return -1;
memset(&e->sample_spec, 0, sizeof(e->sample_spec)); pa_sample_spec_init(&e->sample_spec);
pa_channel_map_init(&e->channel_map); pa_channel_map_init(&e->channel_map);
pa_cvolume_init(&e->volume);
if (ss) { if (ss) {
e->sample_spec = *ss; e->sample_spec = *ss;
e->volume.channels = e->sample_spec.channels; pa_cvolume_reset(&e->volume, ss->channels);
} }
if (map) if (map)
@ -310,17 +313,21 @@ int pa_scache_play_item(pa_core *c, const char *name, pa_sink *sink, pa_volume_t
pa_assert(name); pa_assert(name);
pa_assert(sink); pa_assert(sink);
if (!(e = pa_namereg_get(c, name, PA_NAMEREG_SAMPLE, 1))) if (!(e = pa_namereg_get(c, name, PA_NAMEREG_SAMPLE, FALSE)))
return -1; return -1;
if (e->lazy && !e->memchunk.memblock) { if (e->lazy && !e->memchunk.memblock) {
pa_channel_map old_channel_map = e->channel_map;
if (pa_sound_file_load(c->mempool, e->filename, &e->sample_spec, &e->channel_map, &e->memchunk) < 0) if (pa_sound_file_load(c->mempool, e->filename, &e->sample_spec, &e->channel_map, &e->memchunk) < 0)
return -1; return -1;
pa_subscription_post(c, PA_SUBSCRIPTION_EVENT_SAMPLE_CACHE|PA_SUBSCRIPTION_EVENT_CHANGE, e->index); pa_subscription_post(c, PA_SUBSCRIPTION_EVENT_SAMPLE_CACHE|PA_SUBSCRIPTION_EVENT_CHANGE, e->index);
if (e->volume.channels > e->sample_spec.channels) if (pa_cvolume_valid(&e->volume))
e->volume.channels = e->sample_spec.channels; pa_cvolume_remap(&e->volume, &old_channel_map, &e->channel_map);
else
pa_cvolume_reset(&e->volume, e->sample_spec.channels);
} }
if (!e->memchunk.memblock) if (!e->memchunk.memblock)
@ -383,7 +390,7 @@ uint32_t pa_scache_get_id_by_name(pa_core *c, const char *name) {
pa_assert(c); pa_assert(c);
pa_assert(name); pa_assert(name);
if (!(e = pa_namereg_get(c, name, PA_NAMEREG_SAMPLE, 0))) if (!(e = pa_namereg_get(c, name, PA_NAMEREG_SAMPLE, FALSE)))
return PA_IDXSET_INVALID; return PA_IDXSET_INVALID;
return e->index; return e->index;

1
src/pulsecore/namereg.c
View file

@ -51,6 +51,7 @@ static pa_bool_t is_valid_char(char c) {
(c >= 'A' && c <= 'Z') || (c >= 'A' && c <= 'Z') ||
(c >= '0' && c <= '9') || (c >= '0' && c <= '9') ||
c == '.' || c == '.' ||
c == '-' ||
c == '_'; c == '_';
} }