[pulseaudio-commits] r1633 - in /branches/lennart/src/modules: module-alsa-sink.c module-alsa-source.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Sat Aug 11 17:59:02 2007
New Revision: 1633

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1633&root=3Dpulseaudio&vi=
ew=3Drev
Log:
modify alsa drivers to make use of new global fragment setting variables

Modified:
    branches/lennart/src/modules/module-alsa-sink.c
    branches/lennart/src/modules/module-alsa-source.c

Modified: branches/lennart/src/modules/module-alsa-sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/modules/mo=
dule-alsa-sink.c?rev=3D1633&root=3Dpulseaudio&r1=3D1632&r2=3D1633&view=3Ddi=
ff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/modules/module-alsa-sink.c (original)
+++ branches/lennart/src/modules/module-alsa-sink.c Sat Aug 11 17:59:02 2007
@@ -70,9 +70,6 @@
         "mmap=3D<enable memory mapping?>")
 =

 #define DEFAULT_DEVICE "default"
-
-#define DEFAULT_NFRAGS 4
-#define DEFAULT_FRAGSIZE_MSEC 25
 =

 struct userdata {
     pa_core *core;
@@ -741,8 +738,8 @@
 =

     frame_size =3D pa_frame_size(&ss);
 =

-    nfrags =3D DEFAULT_NFRAGS;
-    frag_size =3D pa_usec_to_bytes(DEFAULT_FRAGSIZE_MSEC*1000, &ss);
+    nfrags =3D m->core->default_n_fragments;
+    frag_size =3D pa_usec_to_bytes(m->core->default_fragment_size_msec*100=
0, &ss);
     if (frag_size <=3D 0)
         frag_size =3D frame_size;
 =


Modified: branches/lennart/src/modules/module-alsa-source.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/modules/mo=
dule-alsa-source.c?rev=3D1633&root=3Dpulseaudio&r1=3D1632&r2=3D1633&view=3D=
diff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/modules/module-alsa-source.c (original)
+++ branches/lennart/src/modules/module-alsa-source.c Sat Aug 11 17:59:02 2=
007
@@ -71,8 +71,6 @@
         "mmap=3D<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 @@
 =

     frame_size =3D pa_frame_size(&ss);
 =

-    /* Fix latency to 100ms */
-    nfrags =3D DEFAULT_NFRAGS;
-    frag_size =3D pa_usec_to_bytes(DEFAULT_FRAGSIZE_MSEC*1000, &ss);
+    nfrags =3D m->core->default_n_fragments;
+    frag_size =3D pa_usec_to_bytes(m->core->default_fragment_size_msec*100=
0, &ss);
     if (frag_size <=3D 0)
         frag_size =3D frame_size;
 =