diff options
-rw-r--r-- | src/map-file | 4 | ||||
-rw-r--r-- | src/modules/module-alsa-sink.c | 2 | ||||
-rw-r--r-- | src/modules/module-alsa-source.c | 2 | ||||
-rw-r--r-- | src/modules/module-sine-source.c | 9 | ||||
-rw-r--r-- | src/pulse/proplist.c | 12 | ||||
-rw-r--r-- | src/pulse/proplist.h | 8 |
6 files changed, 24 insertions, 13 deletions
diff --git a/src/map-file b/src/map-file index 59006fe0..0247933a 100644 --- a/src/map-file +++ b/src/map-file @@ -148,15 +148,17 @@ pa_proplist_clear; pa_proplist_contains; pa_proplist_copy; pa_proplist_free; +pa_proplist_from_string; pa_proplist_get; pa_proplist_gets; +pa_proplist_isempty; pa_proplist_iterate; pa_proplist_new; pa_proplist_set; pa_proplist_setf; pa_proplist_sets; +pa_proplist_size; pa_proplist_to_string; -pa_proplist_from_string; pa_proplist_unset; pa_proplist_unset_many; pa_proplist_update; diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c index f9fb9bd5..6fa45e32 100644 --- a/src/modules/module-alsa-sink.c +++ b/src/modules/module-alsa-sink.c @@ -613,7 +613,7 @@ static int update_sw_params(struct userdata *u) { pa_usec_t sleep_usec, process_usec; hw_sleep_time(u, &sleep_usec, &process_usec); - avail_min += pa_usec_to_bytes(sleep_usec, &u->sink->sample_spec); + avail_min += pa_usec_to_bytes(sleep_usec, &u->sink->sample_spec) / u->frame_size; } pa_log_debug("setting avail_min=%lu", (unsigned long) avail_min); diff --git a/src/modules/module-alsa-source.c b/src/modules/module-alsa-source.c index a6e4c907..768c8c19 100644 --- a/src/modules/module-alsa-source.c +++ b/src/modules/module-alsa-source.c @@ -558,7 +558,7 @@ static int update_sw_params(struct userdata *u) { pa_usec_t sleep_usec, process_usec; hw_sleep_time(u, &sleep_usec, &process_usec); - avail_min += pa_usec_to_bytes(sleep_usec, &u->source->sample_spec); + avail_min += pa_usec_to_bytes(sleep_usec, &u->source->sample_spec) / u->frame_size; } pa_log_debug("setting avail_min=%lu", (unsigned long) avail_min); diff --git a/src/modules/module-sine-source.c b/src/modules/module-sine-source.c index be95cc39..1b8e7b3c 100644 --- a/src/modules/module-sine-source.c +++ b/src/modules/module-sine-source.c @@ -201,15 +201,6 @@ finish: pa_log_debug("Thread shutting down"); } -static void calc_sine(float *f, size_t l, double freq) { - size_t i; - - l /= sizeof(float); - - for (i = 0; i < l; i++) - *(f++) = (float) 0.5f * sin((double) i*M_PI*2*freq / (double) l); -} - int pa__init(pa_module*m) { struct userdata *u; pa_modargs *ma; diff --git a/src/pulse/proplist.c b/src/pulse/proplist.c index 909df9a7..60a92d44 100644 --- a/src/pulse/proplist.c +++ b/src/pulse/proplist.c @@ -406,3 +406,15 @@ pa_proplist* pa_proplist_copy(pa_proplist *template) { return p; } + +unsigned pa_proplist_size(pa_proplist *p) { + pa_assert(p); + + return pa_hashmap_size(MAKE_HASHMAP(p)); +} + +int pa_proplist_isempty(pa_proplist *p) { + pa_assert(p); + + return pa_hashmap_isempty(MAKE_HASHMAP(p)); +} diff --git a/src/pulse/proplist.h b/src/pulse/proplist.h index 4f1a1ec4..5d65ff3c 100644 --- a/src/pulse/proplist.h +++ b/src/pulse/proplist.h @@ -214,7 +214,7 @@ const char *pa_proplist_iterate(pa_proplist *p, void **state); char *pa_proplist_to_string(pa_proplist *p); /** Allocate a new property list and assign key/value from a human readable string. \since - * 0.9.14 */ + * 0.9.15 */ pa_proplist *pa_proplist_from_string(const char *str); /** Returns 1 if an entry for the specified key is existant in the @@ -228,6 +228,12 @@ void pa_proplist_clear(pa_proplist *p); * the specific list. \since 0.9.11 */ pa_proplist* pa_proplist_copy(pa_proplist *t); +/** Return the number of entries on the property list. \since 0.9.15 */ +unsigned pa_proplist_size(pa_proplist *t); + +/** Returns 0 when the proplist is empty, positive otherwise \since 0.9.15 */ +int pa_proplist_isempty(pa_proplist *t); + PA_C_DECL_END #endif |