rpms/audacious-plugins/F-12 audacious-plugins-2.1-underruns.patch, 1.1, 1.2 audacious-plugins.spec, 1.52, 1.53

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7655

Modified Files:
	audacious-plugins-2.1-underruns.patch audacious-plugins.spec 
Log Message:
* Wed Oct 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-6
- Rediff the underruns patch and set buffer_time_min.


audacious-plugins-2.1-underruns.patch:
 alsa-core.c |   41 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 36 insertions(+), 5 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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- audacious-plugins-2.1-underruns.patch	21 Sep 2009 10:30:06 -0000	1.1
+++ audacious-plugins-2.1-underruns.patch	21 Oct 2009 11:25:17 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Nur audacious-plugins-fedora-2.1/src/alsa-ng/alsa-core.c audacious-plugins-fedora-2.1-underruns/src/alsa-ng/alsa-core.c
---- audacious-plugins-fedora-2.1/src/alsa-ng/alsa-core.c	2009-09-16 00:57:07.000000000 +0200
-+++ audacious-plugins-fedora-2.1-underruns/src/alsa-ng/alsa-core.c	2009-09-19 17:38:22.574485456 +0200
+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
 @@ -27,6 +27,10 @@
  static gboolean pcm_going = FALSE;
  static GThread *audio_thread = NULL;
@@ -39,7 +39,7 @@ diff -Nur audacious-plugins-fedora-2.1/s
              snd_pcm_drop(pcm_handle);
              snd_pcm_prepare(pcm_handle);
              wr_total = flush_request * (long long) bps / 1000;
-@@ -264,12 +272,26 @@
+@@ -264,12 +272,25 @@
              continue;
          }
  
@@ -58,7 +58,7 @@ diff -Nur audacious-plugins-fedora-2.1/s
 +            if (size > looppostsize)
 +                size = looppostsize;
  
-         alsaplug_ringbuffer_read (& pcm_ringbuf, buf, size);
+-        alsaplug_ringbuffer_read (& pcm_ringbuf, buf, size);
 +            alsaplug_ringbuffer_read (& pcm_ringbuf, buf, size);
 +        }
          g_mutex_unlock (pcm_state_mutex);
@@ -69,7 +69,23 @@ diff -Nur audacious-plugins-fedora-2.1/s
      }
  
      snd_pcm_drain(pcm_handle);
-@@ -377,6 +399,13 @@
+@@ -339,6 +360,7 @@
+     gint err, bitwidth, ringbuf_size, buf_size;
+     snd_pcm_format_t afmt;
+     snd_pcm_hw_params_t *hwparams = NULL;
++    guint time = 1000 * 100;
+ 
+     afmt = alsaplug_format_convert(fmt);
+     if (afmt == SND_PCM_FORMAT_UNKNOWN)
+@@ -365,6 +387,7 @@
+      "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);
+     CHECK_FAIL (snd_pcm_hw_params (pcm_handle, hwparams), "snd_pcm_hw_params");
+ 
+     bitwidth = snd_pcm_format_physical_width(afmt);
+@@ -377,6 +400,13 @@
          _ERROR("alsaplug_ringbuffer_init failed");
          return -1;
      }
@@ -83,7 +99,7 @@ diff -Nur audacious-plugins-fedora-2.1/s
  
      pcm_going = TRUE;
      flush_request = -1;
-@@ -511,6 +540,7 @@
+@@ -511,6 +541,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.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- audacious-plugins.spec	19 Oct 2009 15:06:17 -0000	1.52
+++ audacious-plugins.spec	21 Oct 2009 11:25:17 -0000	1.53
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -235,6 +235,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-6
+- Rediff the underruns patch and set buffer_time_min.
+
 * Mon Oct 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-5
 - Patch pulseaudio plugin to not get confused by volume values passed
   in via callback.