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

diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c
index d3fe885db9b94f4d8f4f6c6190869f746778f494..af03a958b545a3fe6171440e122d4bab19abc43c 100644 (file)
--- 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 55af4735b10c38fa39ca8b875744210d96c89ca5..5de240699f0c85186994b9408873b5fc81a1aff6 100644 (file)
--- 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;