From a83d1cf1518827e8b5398bcecef1c8216808ee7c Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Wed, 9 Mar 2011 14:31:44 -0800
Subject: audio: make prefs look like old audio, removed old audio.py
---
gnuradio-core/src/python/gnuradio/Makefile.am | 3 +-
gnuradio-core/src/python/gnuradio/audio.py | 88 ---------------------------
2 files changed, 1 insertion(+), 90 deletions(-)
delete mode 100644 gnuradio-core/src/python/gnuradio/audio.py
(limited to 'gnuradio-core/src/python')
diff --git a/gnuradio-core/src/python/gnuradio/Makefile.am b/gnuradio-core/src/python/gnuradio/Makefile.am
index a3f3518de..eff35e95c 100644
--- a/gnuradio-core/src/python/gnuradio/Makefile.am
+++ b/gnuradio-core/src/python/gnuradio/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2004,2007,2008,2009,2010 Free Software Foundation, Inc.
+# Copyright 2004-2011 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -26,7 +26,6 @@ SUBDIRS = gr gru gruimpl blks2 blks2impl vocoder
grpython_PYTHON = \
__init__.py \
- audio.py \
eng_notation.py \
eng_option.py \
modulation_utils.py \
diff --git a/gnuradio-core/src/python/gnuradio/audio.py b/gnuradio-core/src/python/gnuradio/audio.py
deleted file mode 100644
index f6e921f0e..000000000
--- a/gnuradio-core/src/python/gnuradio/audio.py
+++ /dev/null
@@ -1,88 +0,0 @@
-#
-# Copyright 2004,2006 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.
-#
-
-"""
-This is the 'generic' audio or soundcard interface.
-
-The behavior of this module is controlled by the [audio] audio_module
-configuration parameter. If it is 'auto' we attempt to import modules
-from the known_modules list, using the first one imported successfully.
-
-If [audio] audio_module is not 'auto', we assume it's the name of
-an audio module and attempt to import it.
-"""
-
-__all__ = ['source', 'sink']
-
-from gnuradio import gr
-import sys
-
-source = None
-sink = None
-
-
-known_modules = (
- 'audio_alsa', 'audio_oss', 'audio_osx', 'audio_jack', 'audio_portaudio', 'audio_windows')
-
-
-def try_import(name):
- """
- Build a blob of code and try to execute it.
- If it succeeds we will have set the globals source and sink
- as side effects.
-
- returns True or False
- """
- global source, sink
- full_name = "gnuradio." + name
- code = """
-import %s
-source = %s.source
-sink = %s.sink
-""" % (full_name, full_name, full_name)
- try:
- exec code in globals()
- return True
- except ImportError:
- return False
-
-
-def __init__ ():
- p = gr.prefs() # get preferences (config file) object
- verbose = p.get_bool('audio', 'verbose', False)
- module = p.get_string('audio', 'audio_module', 'auto')
-
- if module == 'auto': # search our list for the first one that we can import
- for m in known_modules:
- if try_import(m):
- if verbose: sys.stderr.write('audio: using %s\n' % (m,))
- return
- raise ImportError, 'Unable to locate an audio module.'
-
- else: # use the one the user specified
- if try_import(module):
- if verbose: sys.stderr.write('audio: using %s\n' % (module,))
- else:
- msg = 'Failed to import user-specified audio module %s' % (module,)
- if verbose: sys.stderr.write('audio: %s\n' % (msg,))
- raise ImportError, msg
-
-__init__()
--
cgit