[Commit-gnuradio] r4294 - in gnuradio/trunk/gnuradio-core/src: lib/io python/gnuradio/blksimpl

[trondeau]

Author: trondeau
Date: 2007-01-26 13:02:22 -0700 (Fri, 26 Jan 2007)
New Revision: 4294

Modified:
   gnuradio/trunk/gnuradio-core/src/lib/io/Makefile.am
   gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_sink.cc
   gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_sink.h
   gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_sink.i
   gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_source.cc
   gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_source.h
   gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_source.i
   gnuradio/trunk/gnuradio-core/src/python/gnuradio/blksimpl/nbfm_tx.py
Log:
updated copyright info, and snuck a little something else in (you didn't see 
anything...)

Modified: gnuradio/trunk/gnuradio-core/src/lib/io/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/io/Makefile.am 2007-01-26 19:24:06 UTC 
(rev 4293)
+++ gnuradio/trunk/gnuradio-core/src/lib/io/Makefile.am 2007-01-26 20:02:22 UTC 
(rev 4294)
@@ -1,5 +1,5 @@
 #
-# Copyright 2001,2003,2004 Free Software Foundation, Inc.
+# Copyright 2001,2003,2004,2006 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -79,7 +79,9 @@
        microtune_xxxx_eval_board.h     \
        ppio.h                          \
        ppio_ppdev.h                    \
-       sdr_1000.h                      
+       sdr_1000.h                      \
+       gr_udp_sink.h                   \
+       gr_udp_source.h
 
 
 swiginclude_HEADERS =                  \

Modified: gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_sink.cc
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_sink.cc      2007-01-26 
19:24:06 UTC (rev 4293)
+++ gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_sink.cc      2007-01-26 
20:02:22 UTC (rev 4294)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2006 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 

Modified: gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_sink.h
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_sink.h       2007-01-26 
19:24:06 UTC (rev 4293)
+++ gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_sink.h       2007-01-26 
20:02:22 UTC (rev 4294)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2006 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 

Modified: gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_sink.i
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_sink.i       2007-01-26 
19:24:06 UTC (rev 4293)
+++ gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_sink.i       2007-01-26 
20:02:22 UTC (rev 4294)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2006 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 

Modified: gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_source.cc
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_source.cc    2007-01-26 
19:24:06 UTC (rev 4293)
+++ gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_source.cc    2007-01-26 
20:02:22 UTC (rev 4294)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2006 Free Software Foundation, Inc.
+ * Copyright 2006 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 

Modified: gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_source.h
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_source.h     2007-01-26 
19:24:06 UTC (rev 4293)
+++ gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_source.h     2007-01-26 
20:02:22 UTC (rev 4294)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2006 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 

Modified: gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_source.i
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_source.i     2007-01-26 
19:24:06 UTC (rev 4293)
+++ gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_source.i     2007-01-26 
20:02:22 UTC (rev 4294)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2006 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 

Modified: gnuradio/trunk/gnuradio-core/src/python/gnuradio/blksimpl/nbfm_tx.py
===================================================================
--- gnuradio/trunk/gnuradio-core/src/python/gnuradio/blksimpl/nbfm_tx.py        
2007-01-26 19:24:06 UTC (rev 4293)
+++ gnuradio/trunk/gnuradio-core/src/python/gnuradio/blksimpl/nbfm_tx.py        
2007-01-26 20:02:22 UTC (rev 4294)
@@ -58,13 +58,16 @@
         
         if do_interp:
             interp_factor = quad_rate / audio_rate
-            interp_taps = optfir.low_pass (interp_factor,   # gain
-                                           quad_rate,       # Fs
-                                           4500,            # passband cutoff
-                                           7000,            # stopband cutoff
-                                           0.1,            # passband ripple dB
-                                           40)              # stopband atten dB
+            if 0:
+                interp_taps = optfir.low_pass (interp_factor,   # gain
+                                               quad_rate,       # Fs
+                                               4500,            # passband 
cutoff
+                                               7000,            # stopband 
cutoff
+                                               0.1,        # passband ripple dB
+                                               40)              # stopband 
atten dB
 
+            else:
+                interp_taps = gr.firdes.low_pass(interp_factor, quad_rate, 
10e3, 8e3)
             #print "len(interp_taps) =", len(interp_taps)
             self.interpolator = gr.interp_fir_filter_fff (interp_factor, 
interp_taps)