[SCM] fluidsynth packaging branch, master, updated. debian/1.1.1-2-1-g7989ad0

diwic-guest at users.alioth.debian.org diwic-guest at users.alioth.debian.org
Sat Jan 30 08:18:04 UTC 2010


The following commit has been merged in the master branch:
commit 7989ad0f62f7c8825b5972c50beaaa1464232426
Author: David Henningsson <diwic at ubuntu.com>
Date:   Sat Jan 30 09:08:38 2010 +0100

    Allow pulseaudio to adjust latency by default.

diff --git a/debian/patches/pulse-adjust-latency.patch b/debian/patches/pulse-adjust-latency.patch
new file mode 100644
index 0000000..90a1e85
--- /dev/null
+++ b/debian/patches/pulse-adjust-latency.patch
@@ -0,0 +1,41 @@
+Description: Allow the pulseaudio driver to adjust latency by default. 
+ Backported part of changeset 281 from svn.
+Origin: http://fluidsynth.resonance.org/trac/changeset/281
+Forwarded: not-needed
+--- a/src/fluid_pulse.c
++++ b/src/fluid_pulse.c
+@@ -63,6 +63,8 @@
+ {
+   fluid_settings_register_str(settings, "audio.pulseaudio.server", "default", 0, NULL, NULL);
+   fluid_settings_register_str(settings, "audio.pulseaudio.device", "default", 0, NULL, NULL);
++  fluid_settings_register_int(settings, "audio.pulseaudio.adjust-latency", 1, 0, 1,
++ 	                      FLUID_HINT_TOGGLED, NULL, NULL);
+ }
+ 
+ 
+@@ -81,7 +83,7 @@
+   pa_sample_spec samplespec;
+   pa_buffer_attr bufattr;
+   double sample_rate;
+-  int period_size, period_bytes;
++  int period_size, period_bytes, adjust_latency;
+   char *server = NULL;
+   char *device = NULL;
+   int realtime_prio = 0;
+@@ -101,6 +103,7 @@
+   fluid_settings_dupstr(settings, "audio.pulseaudio.server", &server);  /* ++ alloc server string */
+   fluid_settings_dupstr(settings, "audio.pulseaudio.device", &device);  /* ++ alloc device string */
+   fluid_settings_getint (settings, "audio.realtime-prio", &realtime_prio);
++  fluid_settings_getint(settings, "audio.pulseaudio.adjust-latency", &adjust_latency);
+ 
+   if (server && strcmp (server, "default") == 0)
+   {
+@@ -124,7 +127,7 @@
+   samplespec.rate = sample_rate;
+ 
+   period_bytes = period_size * sizeof (float) * 2;
+-  bufattr.maxlength = period_bytes;
++  bufattr.maxlength = adjust_latency ? -1 : period_bytes;
+   bufattr.tlength = period_bytes;
+   bufattr.minreq = -1;
+   bufattr.prebuf = -1;    /* Just initialize to same value as tlength */
diff --git a/debian/patches/series b/debian/patches/series
index bd6d6cc..fee4a67 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 # This comment line exists merely to satisfy lintian.
+pulse-adjust-latency.patch

-- 
fluidsynth packaging



More information about the pkg-multimedia-commits mailing list