Replace all calls to `get_initial_sptr` with `make_block_sptr`

First batch of changes:

```
find […] -print0 | xargs -0 sed -i -r '/get_initial_sptr/{:nxt N;/;/!b nxt;s/get_initial_sptr\(\s*new ([^(]+)(.*)\)\)/make_block_sptr<\1>\2)/}'
```

Then:
* Back out `sptr_magic.h` edits
* Change some `friend` clauses
* clang-format the whole thing
* Update checksums in the pybind11 bindings files

27 files changed, 34 insertions, 41 deletions

diff --git a/gr-analog/lib/agc2_cc_impl.cc b/gr-analog/lib/agc2_cc_impl.cc
index 6304b5606..25144c060 100644
--- a/gr-analog/lib/agc2_cc_impl.cc
+++ b/gr-analog/lib/agc2_cc_impl.cc
@@ -22,8 +22,8 @@ namespace analog {
 agc2_cc::sptr
 agc2_cc::make(float attack_rate, float decay_rate, float reference, float gain)
 {
-    return gnuradio::get_initial_sptr(
-        new agc2_cc_impl(attack_rate, decay_rate, reference, gain));
+    return gnuradio::make_block_sptr<agc2_cc_impl>(
+        attack_rate, decay_rate, reference, gain);
 }
 
 agc2_cc_impl::agc2_cc_impl(float attack_rate,
diff --git a/gr-analog/lib/agc2_ff_impl.cc b/gr-analog/lib/agc2_ff_impl.cc
index 8c9f6c926..9af7afcdc 100644
--- a/gr-analog/lib/agc2_ff_impl.cc
+++ b/gr-analog/lib/agc2_ff_impl.cc
@@ -21,8 +21,8 @@ namespace analog {
 agc2_ff::sptr
 agc2_ff::make(float attack_rate, float decay_rate, float reference, float gain)
 {
-    return gnuradio::get_initial_sptr(
-        new agc2_ff_impl(attack_rate, decay_rate, reference, gain));
+    return gnuradio::make_block_sptr<agc2_ff_impl>(
+        attack_rate, decay_rate, reference, gain);
 }
 
 agc2_ff_impl::~agc2_ff_impl() {}
diff --git a/gr-analog/lib/agc3_cc_impl.cc b/gr-analog/lib/agc3_cc_impl.cc
index 2f80c1020..489029b66 100644
--- a/gr-analog/lib/agc3_cc_impl.cc
+++ b/gr-analog/lib/agc3_cc_impl.cc
@@ -28,8 +28,8 @@ agc3_cc::sptr agc3_cc::make(float attack_rate,
                             float gain,
                             int iir_update_decim)
 {
-    return gnuradio::get_initial_sptr(
-        new agc3_cc_impl(attack_rate, decay_rate, reference, gain, iir_update_decim));
+    return gnuradio::make_block_sptr<agc3_cc_impl>(
+        attack_rate, decay_rate, reference, gain, iir_update_decim);
 }
 
 agc3_cc_impl::agc3_cc_impl(float attack_rate,
diff --git a/gr-analog/lib/agc_cc_impl.cc b/gr-analog/lib/agc_cc_impl.cc
index 59ce1f21c..d0f6ff9e1 100644
--- a/gr-analog/lib/agc_cc_impl.cc
+++ b/gr-analog/lib/agc_cc_impl.cc
@@ -21,7 +21,7 @@ namespace analog {
 
 agc_cc::sptr agc_cc::make(float rate, float reference, float gain)
 {
-    return gnuradio::get_initial_sptr(new agc_cc_impl(rate, reference, gain));
+    return gnuradio::make_block_sptr<agc_cc_impl>(rate, reference, gain);
 }
 
 agc_cc_impl::agc_cc_impl(float rate, float reference, float gain)
diff --git a/gr-analog/lib/agc_ff_impl.cc b/gr-analog/lib/agc_ff_impl.cc
index d63ed7d2e..16b435538 100644
--- a/gr-analog/lib/agc_ff_impl.cc
+++ b/gr-analog/lib/agc_ff_impl.cc
@@ -20,7 +20,7 @@ namespace analog {
 
 agc_ff::sptr agc_ff::make(float rate, float reference, float gain)
 {
-    return gnuradio::get_initial_sptr(new agc_ff_impl(rate, reference, gain));
+    return gnuradio::make_block_sptr<agc_ff_impl>(rate, reference, gain);
 }
 
 agc_ff_impl::agc_ff_impl(float rate, float reference, float gain)
diff --git a/gr-analog/lib/cpfsk_bc_impl.cc b/gr-analog/lib/cpfsk_bc_impl.cc
index 5827d3f1c..80112b154 100644
--- a/gr-analog/lib/cpfsk_bc_impl.cc
+++ b/gr-analog/lib/cpfsk_bc_impl.cc
@@ -20,7 +20,7 @@ namespace analog {
 
 cpfsk_bc::sptr cpfsk_bc::make(float k, float ampl, int samples_per_sym)
 {
-    return gnuradio::get_initial_sptr(new cpfsk_bc_impl(k, ampl, samples_per_sym));
+    return gnuradio::make_block_sptr<cpfsk_bc_impl>(k, ampl, samples_per_sym);
 }
 
 cpfsk_bc_impl::cpfsk_bc_impl(float k, float ampl, int samples_per_sym)
diff --git a/gr-analog/lib/ctcss_squelch_ff_impl.cc b/gr-analog/lib/ctcss_squelch_ff_impl.cc
index 692f92057..56da0224a 100644
--- a/gr-analog/lib/ctcss_squelch_ff_impl.cc
+++ b/gr-analog/lib/ctcss_squelch_ff_impl.cc
@@ -29,8 +29,8 @@ static int max_tone_index = 37;
 ctcss_squelch_ff::sptr
 ctcss_squelch_ff::make(int rate, float freq, float level, int len, int ramp, bool gate)
 {
-    return gnuradio::get_initial_sptr(
-        new ctcss_squelch_ff_impl(rate, freq, level, len, ramp, gate));
+    return gnuradio::make_block_sptr<ctcss_squelch_ff_impl>(
+        rate, freq, level, len, ramp, gate);
 }
 
 int ctcss_squelch_ff_impl::find_tone(float freq)
diff --git a/gr-analog/lib/dpll_bb_impl.cc b/gr-analog/lib/dpll_bb_impl.cc
index 18bc054bc..a7d4ac891 100644
--- a/gr-analog/lib/dpll_bb_impl.cc
+++ b/gr-analog/lib/dpll_bb_impl.cc
@@ -20,7 +20,7 @@ namespace analog {
 
 dpll_bb::sptr dpll_bb::make(float period, float gain)
 {
-    return gnuradio::get_initial_sptr(new dpll_bb_impl(period, gain));
+    return gnuradio::make_block_sptr<dpll_bb_impl>(period, gain);
 }
 
 dpll_bb_impl::dpll_bb_impl(float period, float gain)
diff --git a/gr-analog/lib/fastnoise_source_impl.cc b/gr-analog/lib/fastnoise_source_impl.cc
index a8d6d9165..f0f9200ce 100644
--- a/gr-analog/lib/fastnoise_source_impl.cc
+++ b/gr-analog/lib/fastnoise_source_impl.cc
@@ -26,8 +26,7 @@ template <class T>
 typename fastnoise_source<T>::sptr
 fastnoise_source<T>::make(noise_type_t type, float ampl, long seed, long samples)
 {
-    return gnuradio::get_initial_sptr(
-        new fastnoise_source_impl<T>(type, ampl, seed, samples));
+    return gnuradio::make_block_sptr<fastnoise_source_impl<T>>(type, ampl, seed, samples);
 }
 
 template <>
diff --git a/gr-analog/lib/feedforward_agc_cc_impl.cc b/gr-analog/lib/feedforward_agc_cc_impl.cc
index ec94f9d24..afccc75f5 100644
--- a/gr-analog/lib/feedforward_agc_cc_impl.cc
+++ b/gr-analog/lib/feedforward_agc_cc_impl.cc
@@ -21,7 +21,7 @@ namespace analog {
 
 feedforward_agc_cc::sptr feedforward_agc_cc::make(int nsamples, float reference)
 {
-    return gnuradio::get_initial_sptr(new feedforward_agc_cc_impl(nsamples, reference));
+    return gnuradio::make_block_sptr<feedforward_agc_cc_impl>(nsamples, reference);
 }
 
 feedforward_agc_cc_impl::feedforward_agc_cc_impl(int nsamples, float reference)
diff --git a/gr-analog/lib/fmdet_cf_impl.cc b/gr-analog/lib/fmdet_cf_impl.cc
index 02164c5ad..5a4fddeaa 100644
--- a/gr-analog/lib/fmdet_cf_impl.cc
+++ b/gr-analog/lib/fmdet_cf_impl.cc
@@ -22,8 +22,7 @@ namespace analog {
 fmdet_cf::sptr
 fmdet_cf::make(float samplerate, float freq_low, float freq_high, float scl)
 {
-    return gnuradio::get_initial_sptr(
-        new fmdet_cf_impl(samplerate, freq_low, freq_high, scl));
+    return gnuradio::make_block_sptr<fmdet_cf_impl>(samplerate, freq_low, freq_high, scl);
 }
 
 fmdet_cf_impl::fmdet_cf_impl(float samplerate, float freq_low, float freq_high, float scl)
diff --git a/gr-analog/lib/frequency_modulator_fc_impl.cc b/gr-analog/lib/frequency_modulator_fc_impl.cc
index 02c95f609..0e3735701 100644
--- a/gr-analog/lib/frequency_modulator_fc_impl.cc
+++ b/gr-analog/lib/frequency_modulator_fc_impl.cc
@@ -23,7 +23,7 @@ namespace analog {
 
 frequency_modulator_fc::sptr frequency_modulator_fc::make(float sensitivity)
 {
-    return gnuradio::get_initial_sptr(new frequency_modulator_fc_impl(sensitivity));
+    return gnuradio::make_block_sptr<frequency_modulator_fc_impl>(sensitivity);
 }
 
 frequency_modulator_fc_impl::frequency_modulator_fc_impl(float sensitivity)
diff --git a/gr-analog/lib/noise_source_impl.cc b/gr-analog/lib/noise_source_impl.cc
index fb5b3347d..f33eca829 100644
--- a/gr-analog/lib/noise_source_impl.cc
+++ b/gr-analog/lib/noise_source_impl.cc
@@ -24,7 +24,7 @@ template <class T>
 typename noise_source<T>::sptr
 noise_source<T>::make(noise_type_t type, float ampl, long seed)
 {
-    return gnuradio::get_initial_sptr(new noise_source_impl<T>(type, ampl, seed));
+    return gnuradio::make_block_sptr<noise_source_impl<T>>(type, ampl, seed);
 }
 
 template <class T>
diff --git a/gr-analog/lib/phase_modulator_fc_impl.cc b/gr-analog/lib/phase_modulator_fc_impl.cc
index 33dc11c79..eb67d0a60 100644
--- a/gr-analog/lib/phase_modulator_fc_impl.cc
+++ b/gr-analog/lib/phase_modulator_fc_impl.cc
@@ -22,7 +22,7 @@ namespace analog {
 
 phase_modulator_fc::sptr phase_modulator_fc::make(double sensitivity)
 {
-    return gnuradio::get_initial_sptr(new phase_modulator_fc_impl(sensitivity));
+    return gnuradio::make_block_sptr<phase_modulator_fc_impl>(sensitivity);
 }
 
 phase_modulator_fc_impl::phase_modulator_fc_impl(double sensitivity)
diff --git a/gr-analog/lib/pll_carriertracking_cc_impl.cc b/gr-analog/lib/pll_carriertracking_cc_impl.cc
index f403cf352..f52079f3a 100644
--- a/gr-analog/lib/pll_carriertracking_cc_impl.cc
+++ b/gr-analog/lib/pll_carriertracking_cc_impl.cc
@@ -24,8 +24,8 @@ namespace analog {
 pll_carriertracking_cc::sptr
 pll_carriertracking_cc::make(float loop_bw, float max_freq, float min_freq)
 {
-    return gnuradio::get_initial_sptr(
-        new pll_carriertracking_cc_impl(loop_bw, max_freq, min_freq));
+    return gnuradio::make_block_sptr<pll_carriertracking_cc_impl>(
+        loop_bw, max_freq, min_freq);
 }
 
 pll_carriertracking_cc_impl::pll_carriertracking_cc_impl(float loop_bw,
diff --git a/gr-analog/lib/pll_freqdet_cf_impl.cc b/gr-analog/lib/pll_freqdet_cf_impl.cc
index baeecc773..a450b00f5 100644
--- a/gr-analog/lib/pll_freqdet_cf_impl.cc
+++ b/gr-analog/lib/pll_freqdet_cf_impl.cc
@@ -23,8 +23,7 @@ namespace analog {
 
 pll_freqdet_cf::sptr pll_freqdet_cf::make(float loop_bw, float max_freq, float min_freq)
 {
-    return gnuradio::get_initial_sptr(
-        new pll_freqdet_cf_impl(loop_bw, max_freq, min_freq));
+    return gnuradio::make_block_sptr<pll_freqdet_cf_impl>(loop_bw, max_freq, min_freq);
 }
 
 pll_freqdet_cf_impl::pll_freqdet_cf_impl(float loop_bw, float max_freq, float min_freq)
diff --git a/gr-analog/lib/pll_refout_cc_impl.cc b/gr-analog/lib/pll_refout_cc_impl.cc
index 9824d1217..7aa184d97 100644
--- a/gr-analog/lib/pll_refout_cc_impl.cc
+++ b/gr-analog/lib/pll_refout_cc_impl.cc
@@ -22,8 +22,7 @@ namespace analog {
 
 pll_refout_cc::sptr pll_refout_cc::make(float loop_bw, float max_freq, float min_freq)
 {
-    return gnuradio::get_initial_sptr(
-        new pll_refout_cc_impl(loop_bw, max_freq, min_freq));
+    return gnuradio::make_block_sptr<pll_refout_cc_impl>(loop_bw, max_freq, min_freq);
 }
 
 pll_refout_cc_impl::pll_refout_cc_impl(float loop_bw, float max_freq, float min_freq)
diff --git a/gr-analog/lib/probe_avg_mag_sqrd_c_impl.cc b/gr-analog/lib/probe_avg_mag_sqrd_c_impl.cc
index 9c63719b2..de092966d 100644
--- a/gr-analog/lib/probe_avg_mag_sqrd_c_impl.cc
+++ b/gr-analog/lib/probe_avg_mag_sqrd_c_impl.cc
@@ -21,7 +21,7 @@ namespace analog {
 
 probe_avg_mag_sqrd_c::sptr probe_avg_mag_sqrd_c::make(double threshold_db, double alpha)
 {
-    return gnuradio::get_initial_sptr(new probe_avg_mag_sqrd_c_impl(threshold_db, alpha));
+    return gnuradio::make_block_sptr<probe_avg_mag_sqrd_c_impl>(threshold_db, alpha);
 }
 
 probe_avg_mag_sqrd_c_impl::probe_avg_mag_sqrd_c_impl(double threshold_db, double alpha)
diff --git a/gr-analog/lib/probe_avg_mag_sqrd_cf_impl.cc b/gr-analog/lib/probe_avg_mag_sqrd_cf_impl.cc
index 7cc51856e..2141bf54d 100644
--- a/gr-analog/lib/probe_avg_mag_sqrd_cf_impl.cc
+++ b/gr-analog/lib/probe_avg_mag_sqrd_cf_impl.cc
@@ -21,8 +21,7 @@ namespace analog {
 
 probe_avg_mag_sqrd_cf::sptr probe_avg_mag_sqrd_cf::make(double threshold_db, double alpha)
 {
-    return gnuradio::get_initial_sptr(
-        new probe_avg_mag_sqrd_cf_impl(threshold_db, alpha));
+    return gnuradio::make_block_sptr<probe_avg_mag_sqrd_cf_impl>(threshold_db, alpha);
 }
 
 probe_avg_mag_sqrd_cf_impl::probe_avg_mag_sqrd_cf_impl(double threshold_db, double alpha)
diff --git a/gr-analog/lib/probe_avg_mag_sqrd_f_impl.cc b/gr-analog/lib/probe_avg_mag_sqrd_f_impl.cc
index 13bb43f21..805c5c939 100644
--- a/gr-analog/lib/probe_avg_mag_sqrd_f_impl.cc
+++ b/gr-analog/lib/probe_avg_mag_sqrd_f_impl.cc
@@ -21,7 +21,7 @@ namespace analog {
 
 probe_avg_mag_sqrd_f::sptr probe_avg_mag_sqrd_f::make(double threshold_db, double alpha)
 {
-    return gnuradio::get_initial_sptr(new probe_avg_mag_sqrd_f_impl(threshold_db, alpha));
+    return gnuradio::make_block_sptr<probe_avg_mag_sqrd_f_impl>(threshold_db, alpha);
 }
 
 probe_avg_mag_sqrd_f_impl::probe_avg_mag_sqrd_f_impl(double threshold_db, double alpha)
diff --git a/gr-analog/lib/pwr_squelch_cc_impl.cc b/gr-analog/lib/pwr_squelch_cc_impl.cc
index a8b4572fe..a81b2918d 100644
--- a/gr-analog/lib/pwr_squelch_cc_impl.cc
+++ b/gr-analog/lib/pwr_squelch_cc_impl.cc
@@ -20,8 +20,7 @@ namespace analog {
 pwr_squelch_cc::sptr
 pwr_squelch_cc::make(double threshold, double alpha, int ramp, bool gate)
 {
-    return gnuradio::get_initial_sptr(
-        new pwr_squelch_cc_impl(threshold, alpha, ramp, gate));
+    return gnuradio::make_block_sptr<pwr_squelch_cc_impl>(threshold, alpha, ramp, gate);
 }
 
 pwr_squelch_cc_impl::pwr_squelch_cc_impl(double threshold,
diff --git a/gr-analog/lib/pwr_squelch_ff_impl.cc b/gr-analog/lib/pwr_squelch_ff_impl.cc
index 12c658841..40aeca27f 100644
--- a/gr-analog/lib/pwr_squelch_ff_impl.cc
+++ b/gr-analog/lib/pwr_squelch_ff_impl.cc
@@ -20,8 +20,7 @@ namespace analog {
 pwr_squelch_ff::sptr
 pwr_squelch_ff::make(double threshold, double alpha, int ramp, bool gate)
 {
-    return gnuradio::get_initial_sptr(
-        new pwr_squelch_ff_impl(threshold, alpha, ramp, gate));
+    return gnuradio::make_block_sptr<pwr_squelch_ff_impl>(threshold, alpha, ramp, gate);
 }
 
 pwr_squelch_ff_impl::pwr_squelch_ff_impl(double threshold,
diff --git a/gr-analog/lib/quadrature_demod_cf_impl.cc b/gr-analog/lib/quadrature_demod_cf_impl.cc
index d285b40fc..a76b98a5e 100644
--- a/gr-analog/lib/quadrature_demod_cf_impl.cc
+++ b/gr-analog/lib/quadrature_demod_cf_impl.cc
@@ -22,7 +22,7 @@ namespace analog {
 
 quadrature_demod_cf::sptr quadrature_demod_cf::make(float gain)
 {
-    return gnuradio::get_initial_sptr(new quadrature_demod_cf_impl(gain));
+    return gnuradio::make_block_sptr<quadrature_demod_cf_impl>(gain);
 }
 
 quadrature_demod_cf_impl::quadrature_demod_cf_impl(float gain)
diff --git a/gr-analog/lib/rail_ff_impl.cc b/gr-analog/lib/rail_ff_impl.cc
index 17f2737fa..33baddf3b 100644
--- a/gr-analog/lib/rail_ff_impl.cc
+++ b/gr-analog/lib/rail_ff_impl.cc
@@ -21,7 +21,7 @@ namespace analog {
 
 rail_ff::sptr rail_ff::make(float lo, float hi)
 {
-    return gnuradio::get_initial_sptr(new rail_ff_impl(lo, hi));
+    return gnuradio::make_block_sptr<rail_ff_impl>(lo, hi);
 }
 
 rail_ff_impl::rail_ff_impl(float lo, float hi)
diff --git a/gr-analog/lib/random_uniform_source_impl.cc b/gr-analog/lib/random_uniform_source_impl.cc
index 47f613de8..9377169ee 100644
--- a/gr-analog/lib/random_uniform_source_impl.cc
+++ b/gr-analog/lib/random_uniform_source_impl.cc
@@ -23,8 +23,8 @@ template <class T>
 typename random_uniform_source<T>::sptr
 random_uniform_source<T>::make(int minimum, int maximum, int seed)
 {
-    return gnuradio::get_initial_sptr(
-        new random_uniform_source_impl<T>(minimum, maximum, seed));
+    return gnuradio::make_block_sptr<random_uniform_source_impl<T>>(
+        minimum, maximum, seed);
 }
 
 template <class T>
diff --git a/gr-analog/lib/sig_source_impl.cc b/gr-analog/lib/sig_source_impl.cc
index 3f2e45d75..55a4e1451 100644
--- a/gr-analog/lib/sig_source_impl.cc
+++ b/gr-analog/lib/sig_source_impl.cc
@@ -32,8 +32,8 @@ typename sig_source<T>::sptr sig_source<T>::make(double sampling_freq,
                                                  T offset,
                                                  float phase)
 {
-    return gnuradio::get_initial_sptr(
-        new sig_source_impl<T>(sampling_freq, waveform, frequency, ampl, offset, phase));
+    return gnuradio::make_block_sptr<sig_source_impl<T>>(
+        sampling_freq, waveform, frequency, ampl, offset, phase);
 }
 
 template <class T>
diff --git a/gr-analog/lib/simple_squelch_cc_impl.cc b/gr-analog/lib/simple_squelch_cc_impl.cc
index 260bb522d..e89807fd8 100644
--- a/gr-analog/lib/simple_squelch_cc_impl.cc
+++ b/gr-analog/lib/simple_squelch_cc_impl.cc
@@ -21,7 +21,7 @@ namespace analog {
 
 simple_squelch_cc::sptr simple_squelch_cc::make(double threshold_db, double alpha)
 {
-    return gnuradio::get_initial_sptr(new simple_squelch_cc_impl(threshold_db, alpha));
+    return gnuradio::make_block_sptr<simple_squelch_cc_impl>(threshold_db, alpha);
 }
 
 simple_squelch_cc_impl::simple_squelch_cc_impl(double threshold_db, double alpha)