Merge branch 'master' into constell_obj

Conflicts:
	gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h
	gr-audio-oss/src/Makefile.swig.gen
	gr-audio/swig/Makefile.swig.gen

1 files changed, 0 insertions, 65 deletions

diff --git a/gr-audio-osx/src/test_audio_loop.py b/gr-audio-osx/src/test_audio_loop.py
deleted file mode 100755
index 662631dfb..000000000
--- a/gr-audio-osx/src/test_audio_loop.py
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2006,2007 Free Software Foundation, Inc.
-# 
-# This file is part of GNU Radio.
-# 
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-# 
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-from gnuradio import gr
-from gnuradio import audio
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-
-class my_graph(gr.top_block):
-
-    def __init__(self):
-        gr.top_block.__init__(self)
-
-        parser = OptionParser(option_class=eng_option)
-        parser.add_option("-O", "--audio-output",
-			  type="string",
-			  default="",
-                          help="audio output device name. E.g., hw:0,0 or /dev/dsp")
-        parser.add_option("-I", "--audio-input",
-			  type="string",
-			  default="",
-                          help="audio input device name.  E.g., hw:0,0 or /dev/dsp")
-        parser.add_option("-r", "--sample-rate",
-			  type="eng_float",
-			  default=48000,
-                          help="set sample rate to RATE (48000)")
-        (options, args) = parser.parse_args ()
-        if len(args) != 0:
-            parser.print_help()
-            raise SystemExit, 1
-
-        sample_rate = int(options.sample_rate)
-        src = audio.source (sample_rate, options.audio_output)
-        dst = audio.sink (sample_rate, options.audio_output)
-
-        max_chan = max (src.output_signature().max_streams(),
-			dst.output_signature().max_streams())
-
-	for i in range (max_chan):
-		self.connect ((src, i), (dst, i))
-
-if __name__ == '__main__':
-    try:
-        my_graph().run()
-    except KeyboardInterrupt:
-        pass