[Commit-gnuradio] r3808 - in gnuradio/branches/developers/jcorgan/cppwrap: config gnuradio-examples/c++ gnuradio-examples/c++/dialtone

[jcorgan]

Author: jcorgan
Date: 2006-10-17 14:05:41 -0600 (Tue, 17 Oct 2006)
New Revision: 3808

Added:
   
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/Makefile.am
   gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/dialtone/
   
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/dialtone/Makefile.am
   
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/dialtone/dialtone.cc
Removed:
   
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/Makefile.am
   
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/dialtone.cc
Modified:
   gnuradio/branches/developers/jcorgan/cppwrap/config/grc_gnuradio_examples.m4
Log:
Moved C++ dialtone example into subdirectory.

Modified: 
gnuradio/branches/developers/jcorgan/cppwrap/config/grc_gnuradio_examples.m4
===================================================================
--- 
gnuradio/branches/developers/jcorgan/cppwrap/config/grc_gnuradio_examples.m4    
    2006-10-17 19:44:25 UTC (rev 3807)
+++ 
gnuradio/branches/developers/jcorgan/cppwrap/config/grc_gnuradio_examples.m4    
    2006-10-17 20:05:41 UTC (rev 3808)
@@ -35,7 +35,8 @@
         gnuradio-examples/python/multi_usrp/Makefile \
         gnuradio-examples/python/networking/Makefile \
         gnuradio-examples/python/usrp/Makefile \
-       gnuradio-examples/c++/Makefile
+       gnuradio-examples/c++/Makefile \
+       gnuradio-examples/c++/dialtone/Makefile
     ])
 
     passed=yes

Deleted: 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/Makefile.am

Added: 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/Makefile.am  
                            (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/Makefile.am  
    2006-10-17 20:05:41 UTC (rev 3808)
@@ -0,0 +1,24 @@
+#
+# Copyright 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 2, 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
+
+SUBDIRS = dialtone


Property changes on: 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/dialtone
___________________________________________________________________
Name: svn:ignore
   + .deps
.libs
Makefile
Makefile.in
dialtone


Copied: 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/dialtone/Makefile.am
 (from rev 3806, 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/Makefile.am)
===================================================================
--- 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/dialtone/Makefile.am
                             (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/dialtone/Makefile.am
     2006-10-17 20:05:41 UTC (rev 3808)
@@ -0,0 +1,41 @@
+#
+# Copyright 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 2, 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
+
+# For compiling within the GNU Radio build tree
+INCLUDES=$(STD_DEFINES_AND_INCLUDES)
+GR_AUDIO_ALSA_LIBS=$(top_builddir)/gr-audio-alsa/src/libgr_audio_alsa.la
+
+# For compiling outside the tree, these are the usual
+# INCLUDES = -I/usr/local/include -I/usr/local/include/gnuradio
+# GNURADIO_CORE_LIBS = -lgnuradio-core
+# GR_AUDIO_ALSA_LIBS = -lgr_audio_alsa
+
+noinst_PROGRAMS = dialtone
+    
+dialtone_SOURCES = dialtone.cc
+    
+dialtone_LDADD = \
+    $(GNURADIO_CORE_LIBS) \
+    $(GR_AUDIO_ALSA_LIBS)
+
+MOSTLYCLEANFILES = *~

Copied: 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/dialtone/dialtone.cc
 (from rev 3803, 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/dialtone.cc)
===================================================================
--- 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/dialtone/dialtone.cc
                             (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/dialtone/dialtone.cc
     2006-10-17 20:05:41 UTC (rev 3808)
@@ -0,0 +1,44 @@
+/*
+ * Copyright 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 2, 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 <gnuradio/gr_sig_source_f.h>
+#include <gnuradio/audio_alsa_sink.h>
+//#include <gnuradio/gr_null_sink.h>
+#include <gr_flow_graph.h>
+
+int main()
+{
+    gr_sig_source_f_sptr src0, src1;
+    audio_alsa_sink_sptr sink;
+    gr_flow_graph_sptr fg;
+    
+    src0 = gr_make_sig_source_f(48000, GR_SIN_WAVE, 350, 0.5);
+    src1 = gr_make_sig_source_f(48000, GR_SIN_WAVE, 440, 0.5);
+    sink = audio_alsa_make_sink(48000);
+    
+    fg = gr_make_flow_graph();
+    fg->connect(src0, 0, sink, 0);
+    fg->connect(src1, 0, sink, 1);
+
+    fg->run();
+    
+    return 0;
+}

Deleted: 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/c++/dialtone.cc