9 files changed, 60 insertions, 60 deletions
diff --git a/gr-dtv/lib/dvbt2/dvbt2_cellinterleaver_cc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_cellinterleaver_cc_impl.cc
index a4c6c006ab..ccb8b52aec 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_cellinterleaver_cc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_cellinterleaver_cc_impl.cc
@@ -22,8 +22,8 @@ dvbt2_cellinterleaver_cc::make(dvb_framesize_t framesize,
                                int fecblocks,
                                int tiblocks)
 {
-    return gnuradio::get_initial_sptr(
-        new dvbt2_cellinterleaver_cc_impl(framesize, constellation, fecblocks, tiblocks));
+    return gnuradio::make_block_sptr<dvbt2_cellinterleaver_cc_impl>(
+        framesize, constellation, fecblocks, tiblocks);
 }
 
 /*
diff --git a/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc
index 5529f1d9e3..c3448c472c 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc
@@ -39,26 +39,26 @@ dvbt2_framemapper_cc::make(dvb_framesize_t framesize,
                            dvbt2_l1scrambled_t l1scrambled,
                            dvbt2_inband_t inband)
 {
-    return gnuradio::get_initial_sptr(new dvbt2_framemapper_cc_impl(framesize,
-                                                                    rate,
-                                                                    constellation,
-                                                                    rotation,
-                                                                    fecblocks,
-                                                                    tiblocks,
-                                                                    carriermode,
-                                                                    fftsize,
-                                                                    guardinterval,
-                                                                    l1constellation,
-                                                                    pilotpattern,
-                                                                    t2frames,
-                                                                    numdatasyms,
-                                                                    paprmode,
-                                                                    version,
-                                                                    preamble,
-                                                                    inputmode,
-                                                                    reservedbiasbits,
-                                                                    l1scrambled,
-                                                                    inband));
+    return gnuradio::make_block_sptr<dvbt2_framemapper_cc_impl>(framesize,
+                                                                rate,
+                                                                constellation,
+                                                                rotation,
+                                                                fecblocks,
+                                                                tiblocks,
+                                                                carriermode,
+                                                                fftsize,
+                                                                guardinterval,
+                                                                l1constellation,
+                                                                pilotpattern,
+                                                                t2frames,
+                                                                numdatasyms,
+                                                                paprmode,
+                                                                version,
+                                                                preamble,
+                                                                inputmode,
+                                                                reservedbiasbits,
+                                                                l1scrambled,
+                                                                inband);
 }
 
 /*
diff --git a/gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.cc
index 2ff3b0db4c..44559fa65d 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.cc
@@ -26,14 +26,14 @@ dvbt2_freqinterleaver_cc::make(dvbt2_extended_carrier_t carriermode,
                                dvbt2_version_t version,
                                dvbt2_preamble_t preamble)
 {
-    return gnuradio::get_initial_sptr(new dvbt2_freqinterleaver_cc_impl(carriermode,
-                                                                        fftsize,
-                                                                        pilotpattern,
-                                                                        guardinterval,
-                                                                        numdatasyms,
-                                                                        paprmode,
-                                                                        version,
-                                                                        preamble));
+    return gnuradio::make_block_sptr<dvbt2_freqinterleaver_cc_impl>(carriermode,
+                                                                    fftsize,
+                                                                    pilotpattern,
+                                                                    guardinterval,
+                                                                    numdatasyms,
+                                                                    paprmode,
+                                                                    version,
+                                                                    preamble);
 }
 
 /*
diff --git a/gr-dtv/lib/dvbt2/dvbt2_interleaver_bb_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_interleaver_bb_impl.cc
index cfb4487232..8bc61eba61 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_interleaver_bb_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_interleaver_bb_impl.cc
@@ -20,8 +20,8 @@ dvbt2_interleaver_bb::sptr dvbt2_interleaver_bb::make(dvb_framesize_t framesize,
                                                       dvb_code_rate_t rate,
                                                       dvb_constellation_t constellation)
 {
-    return gnuradio::get_initial_sptr(
-        new dvbt2_interleaver_bb_impl(framesize, rate, constellation));
+    return gnuradio::make_block_sptr<dvbt2_interleaver_bb_impl>(
+        framesize, rate, constellation);
 }
 
 /*
diff --git a/gr-dtv/lib/dvbt2/dvbt2_miso_cc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_miso_cc_impl.cc
index 95048bb813..2f2fde1952 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_miso_cc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_miso_cc_impl.cc
@@ -23,8 +23,8 @@ dvbt2_miso_cc::sptr dvbt2_miso_cc::make(dvbt2_extended_carrier_t carriermode,
                                         int numdatasyms,
                                         dvbt2_papr_t paprmode)
 {
-    return gnuradio::get_initial_sptr(new dvbt2_miso_cc_impl(
-        carriermode, fftsize, pilotpattern, guardinterval, numdatasyms, paprmode));
+    return gnuradio::make_block_sptr<dvbt2_miso_cc_impl>(
+        carriermode, fftsize, pilotpattern, guardinterval, numdatasyms, paprmode);
 }
 
 /*
diff --git a/gr-dtv/lib/dvbt2/dvbt2_modulator_bc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_modulator_bc_impl.cc
index bef4635a8c..6ef987b61b 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_modulator_bc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_modulator_bc_impl.cc
@@ -21,8 +21,8 @@ dvbt2_modulator_bc::sptr dvbt2_modulator_bc::make(dvb_framesize_t framesize,
                                                   dvb_constellation_t constellation,
                                                   dvbt2_rotation_t rotation)
 {
-    return gnuradio::get_initial_sptr(
-        new dvbt2_modulator_bc_impl(framesize, constellation, rotation));
+    return gnuradio::make_block_sptr<dvbt2_modulator_bc_impl>(
+        framesize, constellation, rotation);
 }
 
 /*
diff --git a/gr-dtv/lib/dvbt2/dvbt2_p1insertion_cc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_p1insertion_cc_impl.cc
index e8233cdd26..3025113d1c 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_p1insertion_cc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_p1insertion_cc_impl.cc
@@ -27,8 +27,8 @@ dvbt2_p1insertion_cc::make(dvbt2_extended_carrier_t carriermode,
                            dvbt2_showlevels_t showlevels,
                            float vclip)
 {
-    return gnuradio::get_initial_sptr(new dvbt2_p1insertion_cc_impl(
-        carriermode, fftsize, guardinterval, numdatasyms, preamble, showlevels, vclip));
+    return gnuradio::make_block_sptr<dvbt2_p1insertion_cc_impl>(
+        carriermode, fftsize, guardinterval, numdatasyms, preamble, showlevels, vclip);
 }
 
 /*
diff --git a/gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc
index 211dea1ac1..33672fd632 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc
@@ -34,16 +34,16 @@ dvbt2_paprtr_cc::sptr dvbt2_paprtr_cc::make(dvbt2_extended_carrier_t carriermode
                                             int iterations,
                                             unsigned int vlength)
 {
-    return gnuradio::get_initial_sptr(new dvbt2_paprtr_cc_impl(carriermode,
-                                                               fftsize,
-                                                               pilotpattern,
-                                                               guardinterval,
-                                                               numdatasyms,
-                                                               paprmode,
-                                                               version,
-                                                               vclip,
-                                                               iterations,
-                                                               vlength));
+    return gnuradio::make_block_sptr<dvbt2_paprtr_cc_impl>(carriermode,
+                                                           fftsize,
+                                                           pilotpattern,
+                                                           guardinterval,
+                                                           numdatasyms,
+                                                           paprmode,
+                                                           version,
+                                                           vclip,
+                                                           iterations,
+                                                           vlength);
 }
 
 /*
diff --git a/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc
index a387948967..188821abce 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc
@@ -32,18 +32,18 @@ dvbt2_pilotgenerator_cc::make(dvbt2_extended_carrier_t carriermode,
                               dvbt2_bandwidth_t bandwidth,
                               unsigned int vlength)
 {
-    return gnuradio::get_initial_sptr(new dvbt2_pilotgenerator_cc_impl(carriermode,
-                                                                       fftsize,
-                                                                       pilotpattern,
-                                                                       guardinterval,
-                                                                       numdatasyms,
-                                                                       paprmode,
-                                                                       version,
-                                                                       preamble,
-                                                                       misogroup,
-                                                                       equalization,
-                                                                       bandwidth,
-                                                                       vlength));
+    return gnuradio::make_block_sptr<dvbt2_pilotgenerator_cc_impl>(carriermode,
+                                                                   fftsize,
+                                                                   pilotpattern,
+                                                                   guardinterval,
+                                                                   numdatasyms,
+                                                                   paprmode,
+                                                                   version,
+                                                                   preamble,
+                                                                   misogroup,
+                                                                   equalization,
+                                                                   bandwidth,
+                                                                   vlength);
 }
 
 /*