8 files changed, 1 insertions, 216 deletions
diff --git a/gnuradio-core/src/lib/general/CMakeLists.txt b/gnuradio-core/src/lib/general/CMakeLists.txt
index acec7729c..137c73e1a 100644
--- a/gnuradio-core/src/lib/general/CMakeLists.txt
+++ b/gnuradio-core/src/lib/general/CMakeLists.txt
@@ -276,7 +276,6 @@ set(gr_core_general_triple_threats
     gr_vector_to_streams
     gr_unpack_k_bits_bb
     gr_scrambler_bb
-    gr_probe_density_b
     gr_annotator_alltoall
     gr_annotator_1to1
     gr_burst_tagger
diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i
index e483fb7a9..ce89b8e67 100644
--- a/gnuradio-core/src/lib/general/general.i
+++ b/gnuradio-core/src/lib/general/general.i
@@ -119,7 +119,6 @@
 #include <gr_encode_ccsds_27_bb.h>
 #include <gr_decode_ccsds_27_fb.h>
 #include <gr_scrambler_bb.h>
-#include <gr_probe_density_b.h>
 #include <gr_rail_ff.h>
 #include <gr_stretch_ff.h>
 #include <gr_copy.h>
@@ -229,7 +228,6 @@
 %include "gr_encode_ccsds_27_bb.i"
 %include "gr_decode_ccsds_27_fb.i"
 %include "gr_scrambler_bb.i"
-%include "gr_probe_density_b.i"
 %include "gr_rail_ff.i"
 %include "gr_stretch_ff.i"
 %include "gr_copy.i"
diff --git a/gnuradio-core/src/lib/general/gr_probe_density_b.cc b/gnuradio-core/src/lib/general/gr_probe_density_b.cc
deleted file mode 100644
index 31661780a..000000000
--- a/gnuradio-core/src/lib/general/gr_probe_density_b.cc
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2010 Free Software Foundation, Inc.
- *
- * 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gr_probe_density_b.h>
-#include <gr_io_signature.h>
-#include <stdexcept>
-#include <iostream>
-
-gr_probe_density_b_sptr
-gr_make_probe_density_b(double alpha)
-{
-  return gnuradio::get_initial_sptr(new gr_probe_density_b(alpha));
-}
-
-gr_probe_density_b::gr_probe_density_b(double alpha)
-  : gr_sync_block("density_b",
-		  gr_make_io_signature(1, 1, sizeof(char)),
-		  gr_make_io_signature(0, 0, 0))
-{
-  set_alpha(alpha);
-  d_density = 1.0;
-}
-
-gr_probe_density_b::~gr_probe_density_b()
-{
-}
-
-int
-gr_probe_density_b::work(int noutput_items,
-			 gr_vector_const_void_star &input_items,
-			 gr_vector_void_star &output_items)
-{
-  const char *in = (const char *)input_items[0];
-
-  for (int i = 0; i < noutput_items; i++)
-    d_density = d_alpha*(double)in[i] + d_beta*d_density;
-
-  return noutput_items;
-}
-
-void
-gr_probe_density_b::set_alpha(double alpha)
-{
-  d_alpha = alpha;
-  d_beta = 1.0-d_alpha;
-}
-
diff --git a/gnuradio-core/src/lib/general/gr_probe_density_b.h b/gnuradio-core/src/lib/general/gr_probe_density_b.h
deleted file mode 100644
index ab84a63a9..000000000
--- a/gnuradio-core/src/lib/general/gr_probe_density_b.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * 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_PROBE_DENSITY_B_H
-#define INCLUDED_GR_PROBE_DENSITY_B_H
-
-#include <gr_core_api.h>
-#include <gr_sync_block.h>
-
-class gr_probe_density_b;
-
-typedef boost::shared_ptr<gr_probe_density_b> gr_probe_density_b_sptr;
-
-GR_CORE_API gr_probe_density_b_sptr gr_make_probe_density_b(double alpha);
-
-/*!
- * This block maintains a running average of the input stream and
- * makes it available as an accessor function.  The input stream
- * is type unsigned char.
- *
- * If you send this block a stream of unpacked bytes, it will tell
- * you what the bit density is.
- *
- * \param alpha     Average filter constant
- *
- */
-
-class GR_CORE_API gr_probe_density_b : public gr_sync_block
-{
-private:
-  friend GR_CORE_API gr_probe_density_b_sptr gr_make_probe_density_b(double alpha);
-
-  double d_alpha;
-  double d_beta;
-  double d_density;
-
-  gr_probe_density_b(double alpha);
-
-public:
-  ~gr_probe_density_b();
-
-  /*!
-   * \brief Returns the current density value
-   */
-  double density() const { return d_density; }
-
-  /*!
-   * \brief Set the average filter constant
-   */
-  void set_alpha(double alpha);
-
-  int work(int noutput_items,
-	   gr_vector_const_void_star &input_items,
-	   gr_vector_void_star &output_items);
-};
-
-#endif /* INCLUDED_GR_PROBE_DENSITY_B_H */
diff --git a/gnuradio-core/src/lib/general/gr_probe_density_b.i b/gnuradio-core/src/lib/general/gr_probe_density_b.i
deleted file mode 100644
index ca65708af..000000000
--- a/gnuradio-core/src/lib/general/gr_probe_density_b.i
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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.
- */
-
-GR_SWIG_BLOCK_MAGIC(gr,probe_density_b);
-
-gr_probe_density_b_sptr gr_make_probe_density_b(double alpha);
-
-class gr_probe_density_b : public gr_sync_block
-{
-public:
-  double density() const;
-
-  void set_alpha(double alpha);
-
-private:
-  gr_probe_density_b();
-};
diff --git a/gr-digital/examples/narrowband/digital_bert_rx.py b/gr-digital/examples/narrowband/digital_bert_rx.py
index 87398f3aa..daefc5116 100755
--- a/gr-digital/examples/narrowband/digital_bert_rx.py
+++ b/gr-digital/examples/narrowband/digital_bert_rx.py
@@ -81,7 +81,7 @@ class bert_receiver(gr.hier_block2):
         self._descrambler = digital.descrambler_bb(0x8A, 0x7F, 7) # CCSDS 7-bit descrambler
 
         # Measure BER by the density of 0s in the stream
-        self._ber = gr.probe_density_b(1.0/self._symbol_rate)
+        self._ber = digital.probe_density_b(1.0/self._symbol_rate)
         
         self.connect(self, self._demod, self._descrambler, self._ber)
 
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index 9d43a774c..647fcb775 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -225,7 +225,6 @@
 	<cat>
 		<name>Probes</name>
 		<block>gr_probe_avg_mag_sqrd_x</block>
-		<block>gr_probe_density_b</block>
 		<block>gr_probe_signal_f</block>
 	</cat>
 	<cat>
diff --git a/grc/blocks/gr_probe_density_b.xml b/grc/blocks/gr_probe_density_b.xml
deleted file mode 100644
index 3a91256aa..000000000
--- a/grc/blocks/gr_probe_density_b.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Probe Density
-###################################################
- -->
-<block>
-	<name>Probe Density</name>
-	<key>gr_probe_density_b</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.probe_density_b($alpha)</make>
-	<callback>set_alpha($alpha)</callback>
-	<param>
-		<name>Alpha</name>
-		<key>alpha</key>
-		<value>1</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Probe Rate</name>
-		<key>probe_rate</key>
-		<value>10</value>
-		<type>real</type>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>byte</type>
-	</sink>
-	<doc>
-Available functions to probe: density()
-
-Use with the function probe block.
-	</doc>
-</block>