[Commit-gnuradio] r8261 - in gnuradio/branches/releases/3.1/gnuradio-core/src: lib/io python/gnuradio/gr

[jcorgan]

Author: jcorgan
Date: 2008-04-23 23:53:32 -0600 (Wed, 23 Apr 2008)
New Revision: 8261

Modified:
   gnuradio/branches/releases/3.1/gnuradio-core/src/lib/io/gri_wavfile.cc
   
gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/qa_wavefile.py
Log:
Applied changeset r8163 on trunk to release branch.

Modified: gnuradio/branches/releases/3.1/gnuradio-core/src/lib/io/gri_wavfile.cc
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/lib/io/gri_wavfile.cc      
2008-04-24 05:51:22 UTC (rev 8260)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/lib/io/gri_wavfile.cc      
2008-04-24 05:53:32 UTC (rev 8261)
@@ -71,7 +71,7 @@
 static inline int16_t
 host_to_wav(int16_t x)
 {
-  return bswap_32(x);
+  return bswap_16(x);
 }
 
 static inline uint32_t
@@ -89,7 +89,7 @@
 static inline int16_t
 wav_to_host(int16_t x)
 {
-  return bswap_32(x);
+  return bswap_16(x);
 }
 
 #else

Modified: 
gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/qa_wavefile.py
===================================================================
--- 
gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/qa_wavefile.py
  2008-04-24 05:51:22 UTC (rev 8260)
+++ 
gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/qa_wavefile.py
  2008-04-24 05:53:32 UTC (rev 8261)
@@ -39,8 +39,7 @@
        wf = gr.wavfile_source(g_in_file)
        self.assertEqual(wf.sample_rate(), 8000)
 
-    # disabled.  Fails on PPC
-    def xtest_002_checkwavcopy (self):
+    def test_002_checkwavcopy (self):
        infile  = g_in_file
        outfile = "test_out.wav"