rpms/audacious-plugins/F-12 audacious-plugins-2.1-underruns.patch, 1.2, 1.3 audacious-plugins.spec, 1.55, 1.56
Michael Schwendt
mschwendt at fedoraproject.org
Mon Oct 26 11:28:39 UTC 2009
- Previous message (by thread): rpms/audacious-plugins/F-10 audacious-plugins-1.5.1-underruns.patch, 1.1, 1.2 audacious-plugins.spec, 1.39, 1.40
- Next message (by thread): rpms/totem/devel .cvsignore, 1.79, 1.80 sources, 1.79, 1.80 totem.spec, 1.263, 1.264
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mschwendt
Update of /cvs/pkgs/rpms/audacious-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6902
Modified Files:
audacious-plugins-2.1-underruns.patch audacious-plugins.spec
Log Message:
* Mon Oct 26 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-9
- Let buffer_time_min in underruns patch depend on default buffer size.
audacious-plugins-2.1-underruns.patch:
alsa-core.c | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 41 insertions(+), 7 deletions(-)
Index: audacious-plugins-2.1-underruns.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins-2.1-underruns.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- audacious-plugins-2.1-underruns.patch 21 Oct 2009 11:25:17 -0000 1.2
+++ audacious-plugins-2.1-underruns.patch 26 Oct 2009 11:28:38 -0000 1.3
@@ -1,6 +1,6 @@
diff -Nur audacious-plugins-fedora-2.1-orig/src/alsa-ng/alsa-core.c audacious-plugins-fedora-2.1/src/alsa-ng/alsa-core.c
--- audacious-plugins-fedora-2.1-orig/src/alsa-ng/alsa-core.c 2009-10-21 13:18:35.825170784 +0200
-+++ audacious-plugins-fedora-2.1/src/alsa-ng/alsa-core.c 2009-10-21 13:20:45.520178677 +0200
++++ audacious-plugins-fedora-2.1/src/alsa-ng/alsa-core.c 2009-10-26 12:19:30.561386114 +0100
@@ -27,6 +27,10 @@
static gboolean pcm_going = FALSE;
static GThread *audio_thread = NULL;
@@ -69,23 +69,43 @@ diff -Nur audacious-plugins-fedora-2.1-o
}
snd_pcm_drain(pcm_handle);
-@@ -339,6 +360,7 @@
- gint err, bitwidth, ringbuf_size, buf_size;
+@@ -336,9 +357,10 @@
+ static gint
+ alsaplug_open_audio(AFormat fmt, gint rate, gint nch)
+ {
+- gint err, bitwidth, ringbuf_size, buf_size;
++ gint err, bitwidth, ringbuf_size, buf_size, buf_size_norm;
snd_pcm_format_t afmt;
snd_pcm_hw_params_t *hwparams = NULL;
-+ guint time = 1000 * 100;
++ guint buf_time_min;
afmt = alsaplug_format_convert(fmt);
if (afmt == SND_PCM_FORMAT_UNKNOWN)
-@@ -365,6 +387,7 @@
+@@ -354,6 +376,10 @@
+ return -1;
+ }
+
++ buf_size = MAX(aud_cfg->output_buffer_size, 100);
++ buf_size_norm = MAX(buf_size-400, 100);
++ buf_time_min = buf_size_norm * 1000;
++
+ snd_pcm_hw_params_alloca(&hwparams);
+ snd_pcm_hw_params_any(pcm_handle, hwparams);
+
+@@ -365,18 +391,25 @@
"snd_pcm_hw_params_set_channels");
CHECK_FAIL (snd_pcm_hw_params_set_rate (pcm_handle, hwparams, rate, 0),
"snd_pcm_hw_params_set_rate");
-+ snd_pcm_hw_params_set_buffer_time_min (pcm_handle, hwparams, &time, 0);
++ snd_pcm_hw_params_set_buffer_time_min (pcm_handle, hwparams, &buf_time_min, 0);
CHECK_FAIL (snd_pcm_hw_params (pcm_handle, hwparams), "snd_pcm_hw_params");
bitwidth = snd_pcm_format_physical_width(afmt);
-@@ -377,6 +400,13 @@
+ bps = (rate * bitwidth * nch) >> 3;
+
+- buf_size = MAX(aud_cfg->output_buffer_size, 100);
+ ringbuf_size = buf_size * bps / 1000;
+
+ if (alsaplug_ringbuffer_init(&pcm_ringbuf, ringbuf_size) == -1) {
_ERROR("alsaplug_ringbuffer_init failed");
return -1;
}
@@ -99,7 +119,7 @@ diff -Nur audacious-plugins-fedora-2.1-o
pcm_going = TRUE;
flush_request = -1;
-@@ -511,6 +541,7 @@
+@@ -511,6 +544,7 @@
{
g_mutex_lock (pcm_state_mutex);
paused = p;
Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- audacious-plugins.spec 25 Oct 2009 11:32:13 -0000 1.55
+++ audacious-plugins.spec 26 Oct 2009 11:28:39 -0000 1.56
@@ -5,7 +5,7 @@
Name: audacious-plugins
Version: 2.1
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Plugins for the Audacious media player
Group: Applications/Multimedia
URL: http://audacious-media-player.org/
@@ -239,6 +239,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Oct 26 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-9
+- Let buffer_time_min in underruns patch depend on default buffer size.
+
* Sun Oct 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-8
- Patch modplug plugin to remove old cruft and fix playback.
- Previous message (by thread): rpms/audacious-plugins/F-10 audacious-plugins-1.5.1-underruns.patch, 1.1, 1.2 audacious-plugins.spec, 1.39, 1.40
- Next message (by thread): rpms/totem/devel .cvsignore, 1.79, 1.80 sources, 1.79, 1.80 totem.spec, 1.263, 1.264
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list