[Commit-gnuradio] r4042 - in gnuradio/branches/developers/jcorgan/hier/gnuradio-examples: c++/hier python/audio

[jcorgan]

Author: jcorgan
Date: 2006-11-29 22:30:26 -0700 (Wed, 29 Nov 2006)
New Revision: 4042

Modified:
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/hier/dialtone.cc
   gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/hier/sink.cc
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/python/audio/dial_tone2.py
Log:
Work in progress.

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/hier/dialtone.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/hier/dialtone.cc
    2006-11-30 03:34:58 UTC (rev 4041)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/hier/dialtone.cc
    2006-11-30 05:30:26 UTC (rev 4042)
@@ -22,7 +22,7 @@
 #include <dialtone.h>
 #include <gr_io_signature.h>
 #include <source.h>
-#include <gr_nop.h>
+#include <gr_kludge_copy.h>
 #include <sink.h>
 
 // Shared pointer constructor
@@ -38,11 +38,11 @@
               gr_make_io_signature(0,0,0))
 {
     define_component("source", make_source());
-    define_component("filter", gr_make_nop(sizeof(float)));
+    define_component("copy", gr_make_kludge_copy(sizeof(float)));
     define_component("sink", make_sink());
 
-    connect("source", 0, "filter", 0);
-    connect("source", 1, "filter", 1);
-    connect("filter", 0, "sink",   0);
-    connect("filter", 1, "sink",   1);
+    connect("source", 0, "copy", 0);
+    connect("source", 1, "copy", 1);
+    connect("copy", 0, "sink",   0);
+    connect("copy", 1, "sink",   1);
 }

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/hier/sink.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/hier/sink.cc    
    2006-11-30 03:34:58 UTC (rev 4041)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/hier/sink.cc    
    2006-11-30 05:30:26 UTC (rev 4042)
@@ -21,7 +21,7 @@
 
 #include <sink.h>
 #include <gr_io_signature.h>
-#include <gr_nop.h>
+#include <gr_kludge_copy.h>
 #include <output.h>
 
 // Shared pointer constructor
@@ -35,11 +35,11 @@
               gr_make_io_signature(2,2,sizeof(float)),
               gr_make_io_signature(0,0,0))
 {
-    define_component("nop", gr_make_nop(sizeof(float)));
+    define_component("copy", gr_make_kludge_copy(sizeof(float)));
     define_component("output", make_output());
 
-    connect("self", 0, "nop",   0);
-    connect("self", 1, "nop",   1);
-    connect("nop",  0, "output", 0);
-    connect("nop",  1, "output", 1);    
+    connect("self", 0, "copy",   0);
+    connect("self", 1, "copy",   1);
+    connect("copy",  0, "output", 0);
+    connect("copy",  1, "output", 1);    
 }

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/python/audio/dial_tone2.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/python/audio/dial_tone2.py
      2006-11-30 03:34:58 UTC (rev 4041)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/python/audio/dial_tone2.py
      2006-11-30 05:30:26 UTC (rev 4042)
@@ -58,4 +58,4 @@
     try:
        runtime.run()
     except KeyboardInterrupt:
-        pass
+       runtime.stop()