4 files changed, 5 insertions, 35 deletions
diff --git a/gr-blocks/lib/multiply_matrix_cc_impl.cc b/gr-blocks/lib/multiply_matrix_cc_impl.cc
index 7ecf3e95ce..15fc0fc814 100644
--- a/gr-blocks/lib/multiply_matrix_cc_impl.cc
+++ b/gr-blocks/lib/multiply_matrix_cc_impl.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2014 Free Software Foundation, Inc.
+ * Copyright 2014,2017 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *
@@ -31,7 +31,6 @@
 namespace gr {
   namespace blocks {
 
-    const int multiply_matrix_cc::TPP_SELECT_BY_MATRIX = 999;
     const std::string multiply_matrix_cc::MSG_PORT_NAME_SET_A = "set_A";
 
     multiply_matrix_cc::sptr
@@ -85,7 +84,7 @@ namespace gr {
           }
         }
       }
-      if (d_tag_prop_select) {
+      if (tag_propagation_policy() == TPP_CUSTOM) {
         propagate_tags_by_A(noutput_items, input_items.size(), output_items.size());
       }
       return noutput_items;
@@ -178,17 +177,6 @@ namespace gr {
       }
     }
 
-    void
-    multiply_matrix_cc_impl::set_tag_propagation_policy(gr::block::tag_propagation_policy_t tpp)
-    {
-      if (tpp == TPP_SELECT_BY_MATRIX) {
-        set_tag_propagation_policy(TPP_DONT);
-        d_tag_prop_select = true;
-      } else {
-        gr::block::set_tag_propagation_policy(tpp);
-        d_tag_prop_select = false;
-      }
-    }
 
   } /* namespace blocks */
 } /* namespace gr */
diff --git a/gr-blocks/lib/multiply_matrix_cc_impl.h b/gr-blocks/lib/multiply_matrix_cc_impl.h
index b357dde2cb..f342817e26 100644
--- a/gr-blocks/lib/multiply_matrix_cc_impl.h
+++ b/gr-blocks/lib/multiply_matrix_cc_impl.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /* 
- * Copyright 2014 Free Software Foundation, Inc.
+ * Copyright 2014, 2017 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -32,7 +32,6 @@ namespace gr {
     {
      private:
       std::vector<std::vector<gr_complex> > d_A;
-      bool d_tag_prop_select; //!< If true, handle the tag propagation ourselves
 
       void propagate_tags_by_A(int noutput_items, size_t ninput_ports, size_t noutput_ports);
 
@@ -45,8 +44,6 @@ namespace gr {
       const std::vector<std::vector<gr_complex> >& get_A() const { return d_A; };
       bool set_A(const std::vector<std::vector<gr_complex> > &new_A);
 
-      void set_tag_propagation_policy(gr::block::tag_propagation_policy_t p);
-
       int work(int noutput_items,
                gr_vector_const_void_star &input_items,
                gr_vector_void_star &output_items);
diff --git a/gr-blocks/lib/multiply_matrix_ff_impl.cc b/gr-blocks/lib/multiply_matrix_ff_impl.cc
index c0b3abfe98..a5eae4261e 100644
--- a/gr-blocks/lib/multiply_matrix_ff_impl.cc
+++ b/gr-blocks/lib/multiply_matrix_ff_impl.cc
@@ -31,7 +31,6 @@
 namespace gr {
   namespace blocks {
 
-    const int multiply_matrix_ff::TPP_SELECT_BY_MATRIX = 999;
     const std::string multiply_matrix_ff::MSG_PORT_NAME_SET_A = "set_A";
 
     multiply_matrix_ff::sptr
@@ -85,7 +84,7 @@ namespace gr {
           }
         }
       }
-      if (d_tag_prop_select) {
+      if (tag_propagation_policy() == TPP_CUSTOM) {
         propagate_tags_by_A(noutput_items, input_items.size(), output_items.size());
       }
       return noutput_items;
@@ -178,17 +177,6 @@ namespace gr {
       }
     }
 
-    void
-    multiply_matrix_ff_impl::set_tag_propagation_policy(gr::block::tag_propagation_policy_t tpp)
-    {
-      if (((int) tpp) == TPP_SELECT_BY_MATRIX) {
-        set_tag_propagation_policy(TPP_DONT);
-        d_tag_prop_select = true;
-      } else {
-        gr::block::set_tag_propagation_policy(tpp);
-        d_tag_prop_select = false;
-      }
-    }
 
   } /* namespace blocks */
 } /* namespace gr */
diff --git a/gr-blocks/lib/multiply_matrix_ff_impl.h b/gr-blocks/lib/multiply_matrix_ff_impl.h
index c9476bc8d1..93b2bebadd 100644
--- a/gr-blocks/lib/multiply_matrix_ff_impl.h
+++ b/gr-blocks/lib/multiply_matrix_ff_impl.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /* 
- * Copyright 2014 Free Software Foundation, Inc.
+ * Copyright 2014, 2017 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -32,7 +32,6 @@ namespace gr {
     {
      private:
       std::vector<std::vector<float> > d_A;
-      bool d_tag_prop_select; //!< If true, handle the tag propagation ourselves
 
       void propagate_tags_by_A(int noutput_items, size_t ninput_ports, size_t noutput_ports);
 
@@ -45,8 +44,6 @@ namespace gr {
       const std::vector<std::vector<float> >& get_A() const { return d_A; };
       bool set_A(const std::vector<std::vector<float> > &new_A);
 
-      void set_tag_propagation_policy(gr::block::tag_propagation_policy_t p);
-
       int work(int noutput_items,
                gr_vector_const_void_star &input_items,
                gr_vector_void_star &output_items);