From: trondeau <trondeau@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Fri, 26 Jan 2007 20:02:22 +0000 (+0000)
Subject: updated copyright info, and snuck a little something else in (you didn't see anything...)
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=d52c8fc348f5667e2ca7e074844d91af53ae96d4;p=debian%2Fgnuradio

updated copyright info, and snuck a little something else in (you didn't see anything...)

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4294 221aa14e-8319-0410-a670-987f0aec2ac5
---

diff --git a/gnuradio-core/src/lib/io/Makefile.am b/gnuradio-core/src/lib/io/Makefile.am
index 6891f380..8320375c 100644
--- a/gnuradio-core/src/lib/io/Makefile.am
+++ b/gnuradio-core/src/lib/io/Makefile.am
@@ -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 @@ grinclude_HEADERS = 			\
 	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 =			\
diff --git a/gnuradio-core/src/lib/io/gr_udp_sink.cc b/gnuradio-core/src/lib/io/gr_udp_sink.cc
index f5eefdc7..a664615f 100644
--- a/gnuradio-core/src/lib/io/gr_udp_sink.cc
+++ b/gnuradio-core/src/lib/io/gr_udp_sink.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2006 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
diff --git a/gnuradio-core/src/lib/io/gr_udp_sink.h b/gnuradio-core/src/lib/io/gr_udp_sink.h
index f3ededa5..ee346f40 100644
--- a/gnuradio-core/src/lib/io/gr_udp_sink.h
+++ b/gnuradio-core/src/lib/io/gr_udp_sink.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2006 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
diff --git a/gnuradio-core/src/lib/io/gr_udp_sink.i b/gnuradio-core/src/lib/io/gr_udp_sink.i
index 59c828dd..bd4accb3 100644
--- a/gnuradio-core/src/lib/io/gr_udp_sink.i
+++ b/gnuradio-core/src/lib/io/gr_udp_sink.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2006 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
diff --git a/gnuradio-core/src/lib/io/gr_udp_source.cc b/gnuradio-core/src/lib/io/gr_udp_source.cc
index 42683092..70b2f8f9 100644
--- a/gnuradio-core/src/lib/io/gr_udp_source.cc
+++ b/gnuradio-core/src/lib/io/gr_udp_source.cc
@@ -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
  * 
diff --git a/gnuradio-core/src/lib/io/gr_udp_source.h b/gnuradio-core/src/lib/io/gr_udp_source.h
index 162eef7d..c57f4fc8 100644
--- a/gnuradio-core/src/lib/io/gr_udp_source.h
+++ b/gnuradio-core/src/lib/io/gr_udp_source.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2006 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
diff --git a/gnuradio-core/src/lib/io/gr_udp_source.i b/gnuradio-core/src/lib/io/gr_udp_source.i
index e1e9c202..1d6f4c90 100644
--- a/gnuradio-core/src/lib/io/gr_udp_source.i
+++ b/gnuradio-core/src/lib/io/gr_udp_source.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2006 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
diff --git a/gnuradio-core/src/python/gnuradio/blksimpl/nbfm_tx.py b/gnuradio-core/src/python/gnuradio/blksimpl/nbfm_tx.py
index 15c7bbbb..47dc4d46 100644
--- a/gnuradio-core/src/python/gnuradio/blksimpl/nbfm_tx.py
+++ b/gnuradio-core/src/python/gnuradio/blksimpl/nbfm_tx.py
@@ -58,13 +58,16 @@ class nbfm_tx(gr.hier_block):
         
         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)