# HG changeset patch
# User nenolod
# Date 1175777760 25200
# Node ID 153dc928115a521edee7d072ab5dfdc58716db3f
# Parent  51495131e4ae9c8279226368d579b6936d108d95
[svn] - don't resample if source rate matches the internal clock rate. closes #881.

diff -r 51495131e4ae -r 153dc928115a ChangeLog
--- a/ChangeLog	Thu Apr 05 05:32:15 2007 -0700
+++ b/ChangeLog	Thu Apr 05 05:56:00 2007 -0700
@@ -1,3 +1,11 @@
+2007-04-05 12:32:15 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [4322]
+  - synchronize SRC conversion patch with upstream
+  
+  trunk/src/audacious/output.c |   46 ++++++++++++++++++++++++++-----------------
+  1 file changed, 28 insertions(+), 18 deletions(-)
+
+
 2007-04-03 18:54:52 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [4316]
   - this probably fixes bug #858
diff -r 51495131e4ae -r 153dc928115a src/audacious/build_stamp.c
--- a/src/audacious/build_stamp.c	Thu Apr 05 05:32:15 2007 -0700
+++ b/src/audacious/build_stamp.c	Thu Apr 05 05:56:00 2007 -0700
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070403-4316";
+const gchar *svn_stamp = "20070405-4322";
diff -r 51495131e4ae -r 153dc928115a src/audacious/output.c
--- a/src/audacious/output.c	Thu Apr 05 05:32:15 2007 -0700
+++ b/src/audacious/output.c	Thu Apr 05 05:56:00 2007 -0700
@@ -271,6 +271,10 @@
     else
       overSamplingFs = src_rate;
 
+    /* don't resample if sampling rates are the same --nenolod */
+    if (rate == overSamplingFs)
+      src_enabled = FALSE;
+
     if (bmp_cfg_db_get_int(db, NULL, "src_type", &src_type) == FALSE)
       converter_type = SRC_SINC_BEST_QUALITY;
     else