From ff937496d382f1b1097e6936a2ecf850ec01b8cb Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Sep 24 2012 10:51:22 +0000
Subject: Update to 3.3.2 (a few bug-fixes and translation updates).


---

diff --git a/.gitignore b/.gitignore
index a1eece6..62122b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /audacious-plugins-3.3-beta2.tar.bz2
 /audacious-plugins-3.3.tar.bz2
 /audacious-plugins-3.3.1.tar.bz2
+/audacious-plugins-3.3.2.tar.bz2
diff --git a/audacious-plugins-3.3.1-flacng.patch b/audacious-plugins-3.3.1-flacng.patch
deleted file mode 100644
index 0d9a288..0000000
--- a/audacious-plugins-3.3.1-flacng.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- audacious-plugins-3.3.1/src/flacng/plugin.c	2012-08-11 22:13:39.000000000 +0200
-+++ audacious-plugins/src/flacng/plugin.c	2012-08-31 11:05:03.000000000 +0200
-@@ -166,7 +166,13 @@
-     playback->set_pb_ready(playback);
-     playback->set_gain_from_playlist(playback);
- 
--    while (1)
-+    int64_t samples_remaining = INT64_MAX;
-+    if (start_time >= 0 && stop_time >= 0)
-+        samples_remaining = (int64_t) (stop_time - start_time) *
-+         info->sample_rate / 1000 * info->channels;
-+
-+    while (samples_remaining && FLAC__stream_decoder_get_state(decoder) !=
-+     FLAC__STREAM_DECODER_END_OF_STREAM)
-     {
-         pthread_mutex_lock (& mutex);
- 
-@@ -181,6 +187,11 @@
-             playback->output->flush (seek_value);
-             FLAC__stream_decoder_seek_absolute (decoder, (int64_t)
-              seek_value * info->sample_rate / 1000);
-+
-+            if (stop_time >= 0)
-+                samples_remaining = (int64_t) (stop_time - seek_value) *
-+                 info->sample_rate / 1000 * info->channels;
-+
-             seek_value = -1;
-         }
- 
-@@ -191,24 +202,20 @@
-         {
-             FLACNG_ERROR("Error while decoding!\n");
-             error = TRUE;
--            goto CLEANUP;
-+            break;
-         }
- 
-+        if (info->buffer_used >= samples_remaining)
-+            info->buffer_used = samples_remaining;
-+
-         squeeze_audio(info->output_buffer, play_buffer, info->buffer_used, info->bits_per_sample);
-         playback->output->write_audio(play_buffer, info->buffer_used * SAMPLE_SIZE(info->bits_per_sample));
- 
--        reset_info(info);
-+        samples_remaining -= info->buffer_used;
- 
--        /* Have we reached the end of the stream? */
--        if (FLAC__stream_decoder_get_state(decoder) == FLAC__STREAM_DECODER_END_OF_STREAM)
--        {
--            /* Yes. Drain the output buffer and stop playing. */
--            AUDDBG("End of stream reached, draining output buffer\n");
--            goto CLEANUP;
--        }
-+        reset_info(info);
-     }
- 
--CLEANUP:
-     pthread_mutex_lock (& mutex);
-     stop_flag = TRUE;
-     pthread_mutex_unlock (& mutex);
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index 3f12b78..51ce47d 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -10,8 +10,8 @@
 %global aud_ver 3.3-0.1.beta2
 
 Name: audacious-plugins
-Version: 3.3.1
-Release: 3%{?dist}
+Version: 3.3.2
+Release: 1%{?dist}
 Summary: Plugins for the Audacious audio player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -30,8 +30,6 @@ Patch0: audacious-plugins-3.0-alpha1-xmms-skindir.patch
 Patch1: audacious-plugins-3.3-alpha1-enable-gnomeshortcuts.patch
 # Fedora customization: add default system-wide module_path
 Patch2: audacious-plugins-3.1-beta1-ladspa.patch
-# post-3.3.1 / Playlist does not progress for cue sheet of single flac file
-Patch3: audacious-plugins-3.3.1-flacng.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: gettext-devel
@@ -137,7 +135,6 @@ providers may build it with libsidplay 2 instead.
 %patch0 -p1 -b .xmms-skindir
 %patch1 -p1 -b .enable-gnomeshortcuts
 %patch2 -p1 -b .ladspa
-%patch3 -p1 -b .flacng
 
 for i in src/ladspa/plugin.c
 do
@@ -250,6 +247,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Mon Sep 24 2012 Michael Schwendt <mschwendt@fedoraproject.org> - 3.3.2-1
+- Update to 3.3.2 (a few bug-fixes and translation updates).
+
 * Sat Sep  8 2012 Michael Schwendt <mschwendt@fedoraproject.org> - 3.3.1-3
 - Merge fix for "Playlist does not progress for cue sheet
   of single flac file".
diff --git a/sources b/sources
index 6080144..6cae9e9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cc8c6b035279d6ef976bc7775881b42a  audacious-plugins-3.3.1.tar.bz2
+729eba666e2888f7fce73224bc30bd82  audacious-plugins-3.3.2.tar.bz2