[SCM] fluidsynth/master: Drop pulse-adjust-latency.patch patch, applied upstream.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Tue Sep 14 10:38:05 UTC 2010
The following commit has been merged in the master branch:
commit 1ac18d651133374dabd7493d1d215940da13974c
Author: Alessio Treglia <alessio at debian.org>
Date: Tue Sep 14 12:36:47 2010 +0200
Drop pulse-adjust-latency.patch patch, applied upstream.
diff --git a/debian/patches/pulse-adjust-latency.patch b/debian/patches/pulse-adjust-latency.patch
deleted file mode 100644
index 90a1e85..0000000
--- a/debian/patches/pulse-adjust-latency.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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
deleted file mode 100644
index fee4a67..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-# This comment line exists merely to satisfy lintian.
-pulse-adjust-latency.patch
--
fluidsynth packaging
More information about the pkg-multimedia-commits
mailing list