Merge branch 'master' of http://gnuradio.org/git/gnuradio into cpuid

Conflicts:
	volk/Makefile.common
	volk/lib/qa_utils.cc

5 files changed, 138 insertions, 0 deletions

diff --git a/gr-audio/include/.gitignore b/gr-audio/include/.gitignore
new file mode 100644
index 000000000..b336cc7ce
--- /dev/null
+++ b/gr-audio/include/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/gr-audio/include/Makefile.am b/gr-audio/include/Makefile.am
new file mode 100644
index 000000000..a4db27d08
--- /dev/null
+++ b/gr-audio/include/Makefile.am
@@ -0,0 +1,27 @@
+#
+# 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.
+#
+
+include $(top_srcdir)/Makefile.common
+
+grinclude_HEADERS = \
+	gr_audio_api.h \
+	gr_audio_source.h \
+	gr_audio_sink.h
diff --git a/gr-audio/include/gr_audio_api.h b/gr-audio/include/gr_audio_api.h
new file mode 100644
index 000000000..b21819bab
--- /dev/null
+++ b/gr-audio/include/gr_audio_api.h
@@ -0,0 +1,31 @@
+/*
+ * 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_API_H
+#define INCLUDED_GR_AUDIO_API_H
+
+#ifdef gnuradio_audio_EXPORTS
+#  define GR_AUDIO_API //FIXME needs attributes defines
+#else
+#  define GR_AUDIO_API //FIXME needs attributes defines
+#endif
+
+#endif /* INCLUDED_GR_AUDIO_API_H */
diff --git a/gr-audio/include/gr_audio_sink.h b/gr-audio/include/gr_audio_sink.h
new file mode 100644
index 000000000..ca3b15a37
--- /dev/null
+++ b/gr-audio/include/gr_audio_sink.h
@@ -0,0 +1,39 @@
+/*
+ * 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_SINK_H
+#define INCLUDED_GR_AUDIO_SINK_H
+
+#include <gr_audio_api.h>
+#include <gr_sync_block.h>
+
+class GR_AUDIO_API audio_sink : virtual public gr_sync_block{
+public:
+    typedef boost::shared_ptr<audio_sink> sptr;
+};
+
+GR_AUDIO_API audio_sink::sptr audio_make_sink(
+    int sampling_rate,
+    const std::string device_name = "",
+    bool ok_to_block = true
+);
+
+#endif /* INCLUDED_GR_AUDIO_SINK_H */
diff --git a/gr-audio/include/gr_audio_source.h b/gr-audio/include/gr_audio_source.h
new file mode 100644
index 000000000..b8ae2ca5f
--- /dev/null
+++ b/gr-audio/include/gr_audio_source.h
@@ -0,0 +1,39 @@
+/*
+ * 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_SOURCE_H
+#define INCLUDED_GR_AUDIO_SOURCE_H
+
+#include <gr_audio_api.h>
+#include <gr_sync_block.h>
+
+class GR_AUDIO_API audio_source : virtual public gr_sync_block{
+public:
+    typedef boost::shared_ptr<audio_source> sptr;
+};
+
+GR_AUDIO_API audio_source::sptr audio_make_source(
+    int sampling_rate,
+    const std::string device_name = "",
+    bool ok_to_block = true
+);
+
+#endif /* INCLUDED_GR_AUDIO_SOURCE_H */