Merge remote branch 'jblum/wip/gr-audio' into wip/gr-audio

* jblum/wip/gr-audio:
  audio: high prio for platform specific audio osx
  audio: added windows and osx audio source files
  audio: added config checks for other audios, added jack and port
  audio: make prefs look like old audio, removed old audio.py
  audio: register arches with priorities, ex: prefer alsa over oss
  audio: added oss support to gr-audio
  audio: use conf files to specify default arch
  audio: moved the grc audio blocks into gr-audio dir
  audio: moved alsa support files into subdirectory
  audio: work on swig support, it imports
  audio: work to get alsa support in, lets see if this works before adding more
  audio: added audio factory registry and top level includes
  audio: skeleton for gr-audio component

1 files changed, 55 insertions, 0 deletions

diff --git a/gr-audio/lib/gr_audio_registry.h b/gr-audio/lib/gr_audio_registry.h
new file mode 100644
index 000000000..ec341e95e
--- /dev/null
+++ b/gr-audio/lib/gr_audio_registry.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2011 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.
+ */
+
+#ifndef INCLUDED_GR_AUDIO_REGISTRY_H
+#define INCLUDED_GR_AUDIO_REGISTRY_H
+
+#include <gr_audio_sink.h>
+#include <gr_audio_source.h>
+#include <string>
+
+typedef audio_source::sptr(*source_factory_t)(int, const std::string &, bool);
+typedef audio_sink::sptr(*sink_factory_t)(int, const std::string &, bool);
+
+enum reg_prio_type{
+    REG_PRIO_LOW = 100,
+    REG_PRIO_MED = 200,
+    REG_PRIO_HIGH = 300
+};
+
+void audio_register_source(reg_prio_type prio, const std::string &arch, source_factory_t source);
+void audio_register_sink(reg_prio_type prio, const std::string &arch, sink_factory_t sink);
+
+#define AUDIO_REGISTER_FIXTURE(x) static struct x{x();}x;x::x()
+
+#define AUDIO_REGISTER_SOURCE(prio, arch) \
+    static audio_source::sptr arch##_source_fcn(int, const std::string &, bool); \
+    AUDIO_REGISTER_FIXTURE(arch##_source_reg){ \
+        audio_register_source(prio, #arch, &arch##_source_fcn); \
+    } static audio_source::sptr arch##_source_fcn
+
+#define AUDIO_REGISTER_SINK(prio, arch) \
+    static audio_sink::sptr arch##_sink_fcn(int, const std::string &, bool); \
+    AUDIO_REGISTER_FIXTURE(arch##_sink_reg){ \
+        audio_register_sink(prio, #arch, &arch##_sink_fcn); \
+    } static audio_sink::sptr arch##_sink_fcn
+
+#endif /* INCLUDED_GR_AUDIO_REGISTRY_H */