summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-08-11 15:59:02 +0000
committerLennart Poettering <lennart@poettering.net>2007-08-11 15:59:02 +0000
commite1100b5b20a39813a86559a91afa5da3afb51752 (patch)
tree0b8b160bd66c418bd915a542c7925e8ed55e9b5d
parent793f750429a32379fd034d06ee24a3ed768df4a4 (diff)
modify alsa drivers to make use of new global fragment setting variables
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1633 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--src/modules/module-alsa-sink.c7
-rw-r--r--src/modules/module-alsa-source.c7
2 files changed, 4 insertions, 10 deletions
diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c
index d3fe885d..af03a958 100644
--- a/src/modules/module-alsa-sink.c
+++ b/src/modules/module-alsa-sink.c
@@ -71,9 +71,6 @@ PA_MODULE_USAGE(
#define DEFAULT_DEVICE "default"
-#define DEFAULT_NFRAGS 4
-#define DEFAULT_FRAGSIZE_MSEC 25
-
struct userdata {
pa_core *core;
pa_module *module;
@@ -741,8 +738,8 @@ int pa__init(pa_module*m) {
frame_size = pa_frame_size(&ss);
- nfrags = DEFAULT_NFRAGS;
- frag_size = pa_usec_to_bytes(DEFAULT_FRAGSIZE_MSEC*1000, &ss);
+ nfrags = m->core->default_n_fragments;
+ frag_size = pa_usec_to_bytes(m->core->default_fragment_size_msec*1000, &ss);
if (frag_size <= 0)
frag_size = frame_size;
diff --git a/src/modules/module-alsa-source.c b/src/modules/module-alsa-source.c
index 55af4735..5de24069 100644
--- a/src/modules/module-alsa-source.c
+++ b/src/modules/module-alsa-source.c
@@ -71,8 +71,6 @@ PA_MODULE_USAGE(
"mmap=<enable memory mapping?>")
#define DEFAULT_DEVICE "default"
-#define DEFAULT_NFRAGS 4
-#define DEFAULT_FRAGSIZE_MSEC 25
struct userdata {
pa_core *core;
@@ -716,9 +714,8 @@ int pa__init(pa_module*m) {
frame_size = pa_frame_size(&ss);
- /* Fix latency to 100ms */
- nfrags = DEFAULT_NFRAGS;
- frag_size = pa_usec_to_bytes(DEFAULT_FRAGSIZE_MSEC*1000, &ss);
+ nfrags = m->core->default_n_fragments;
+ frag_size = pa_usec_to_bytes(m->core->default_fragment_size_msec*1000, &ss);
if (frag_size <= 0)
frag_size = frame_size;