convert block constructors to typed variants

examples/adsb/src/decoder.rs

@@ -4,14 +4,14 @@ use futuresdr::anyhow::bail;
 use futuresdr::anyhow::Result;
 use futuresdr::macros::async_trait;
 use futuresdr::macros::message_handler;
-use futuresdr::runtime::Block;
 use futuresdr::runtime::BlockMeta;
 use futuresdr::runtime::BlockMetaBuilder;
 use futuresdr::runtime::Kernel;
 use futuresdr::runtime::MessageIo;
 use futuresdr::runtime::MessageIoBuilder;
 use futuresdr::runtime::Pmt;
 use futuresdr::runtime::StreamIoBuilder;
+use futuresdr::runtime::TypedBlock;
 use futuresdr::runtime::WorkIo;
 use futuresdr::tracing::debug;
 use futuresdr::tracing::info;
@@ -45,8 +45,8 @@ pub struct Decoder {
 
 impl Decoder {
     #[allow(clippy::new_ret_no_self)]
-    pub fn new(forward_failed_crc: bool) -> Block {
-        Block::new(
+    pub fn new(forward_failed_crc: bool) -> TypedBlock<Self> {
+        TypedBlock::new(
             BlockMetaBuilder::new("Decoder").build(),
             StreamIoBuilder::new().build(),
             MessageIoBuilder::new()

examples/adsb/src/demodulator.rs

@@ -3,7 +3,6 @@ use crate::SYMBOL_ONE_TAPS;
 use crate::SYMBOL_ZERO_TAPS;
 use futuresdr::anyhow::Result;
 use futuresdr::macros::async_trait;
-use futuresdr::runtime::Block;
 use futuresdr::runtime::BlockMeta;
 use futuresdr::runtime::BlockMetaBuilder;
 use futuresdr::runtime::Kernel;
@@ -13,6 +12,7 @@ use futuresdr::runtime::Pmt;
 use futuresdr::runtime::StreamIo;
 use futuresdr::runtime::StreamIoBuilder;
 use futuresdr::runtime::Tag;
+use futuresdr::runtime::TypedBlock;
 use futuresdr::runtime::WorkIo;
 
 #[derive(Clone, Debug)]
@@ -28,8 +28,8 @@ pub struct Demodulator {
 
 impl Demodulator {
     #[allow(clippy::new_ret_no_self)]
-    pub fn new() -> Block {
-        Block::new(
+    pub fn new() -> TypedBlock<Self> {
+        TypedBlock::new(
             BlockMetaBuilder::new("Demodulator").build(),
             StreamIoBuilder::new().add_input::<f32>("in").build(),
             MessageIoBuilder::new().add_output("out").build(),

examples/adsb/src/preamble_detector.rs

@@ -1,7 +1,6 @@
 use crate::N_SAMPLES_PER_HALF_SYM;
 use futuresdr::anyhow::Result;
 use futuresdr::macros::async_trait;
-use futuresdr::runtime::Block;
 use futuresdr::runtime::BlockMeta;
 use futuresdr::runtime::BlockMetaBuilder;
 use futuresdr::runtime::Kernel;
@@ -10,6 +9,7 @@ use futuresdr::runtime::MessageIoBuilder;
 use futuresdr::runtime::StreamIo;
 use futuresdr::runtime::StreamIoBuilder;
 use futuresdr::runtime::Tag;
+use futuresdr::runtime::TypedBlock;
 use futuresdr::runtime::WorkIo;
 
 pub struct PreambleDetector {
@@ -38,8 +38,8 @@ impl PreambleDetector {
     }
 
     #[allow(clippy::new_ret_no_self)]
-    pub fn new(detection_threshold: f32) -> Block {
-        Block::new(
+    pub fn new(detection_threshold: f32) -> TypedBlock<Self> {
+        TypedBlock::new(
             BlockMetaBuilder::new("PreambleDetector").build(),
             StreamIoBuilder::new()
                 .add_input::<f32>("in_samples")

examples/adsb/src/tracker.rs

@@ -2,7 +2,6 @@ use futuresdr::anyhow::Result;
 use futuresdr::async_io::Timer;
 use futuresdr::macros::async_trait;
 use futuresdr::macros::message_handler;
-use futuresdr::runtime::Block;
 use futuresdr::runtime::BlockMeta;
 use futuresdr::runtime::BlockMetaBuilder;
 use futuresdr::runtime::Kernel;
@@ -11,6 +10,7 @@ use futuresdr::runtime::MessageIoBuilder;
 use futuresdr::runtime::Pmt;
 use futuresdr::runtime::StreamIo;
 use futuresdr::runtime::StreamIoBuilder;
+use futuresdr::runtime::TypedBlock;
 use futuresdr::runtime::WorkIo;
 use futuresdr::tracing::info;
 use futuresdr::tracing::warn;
@@ -33,19 +33,19 @@ pub struct Tracker {
 impl Tracker {
     /// Creates a new tracker without pruning.
     #[allow(clippy::new_ret_no_self)]
-    pub fn new() -> Block {
+    pub fn new() -> TypedBlock<Self> {
         Tracker::new_with_optional_args(None)
     }
 
-    pub fn with_pruning(after: Duration) -> Block {
+    pub fn with_pruning(after: Duration) -> TypedBlock<Self> {
         Tracker::new_with_optional_args(Some(after))
     }
 
-    fn new_with_optional_args(prune_after: Option<Duration>) -> Block {
+    fn new_with_optional_args(prune_after: Option<Duration>) -> TypedBlock<Self> {
         let aircraft_register = AircraftRegister {
             register: HashMap::new(),
         };
-        Block::new(
+        TypedBlock::new(
             BlockMetaBuilder::new("Tracker").build(),
             StreamIoBuilder::new().build(),
             MessageIoBuilder::new()

examples/android-hw/src/fft_shift.rs

@@ -2,14 +2,14 @@ use std::marker::PhantomData;
 
 use futuresdr::anyhow::Result;
 use futuresdr::macros::async_trait;
-use futuresdr::runtime::Block;
 use futuresdr::runtime::BlockMeta;
 use futuresdr::runtime::BlockMetaBuilder;
 use futuresdr::runtime::Kernel;
 use futuresdr::runtime::MessageIo;
 use futuresdr::runtime::MessageIoBuilder;
 use futuresdr::runtime::StreamIo;
 use futuresdr::runtime::StreamIoBuilder;
+use futuresdr::runtime::TypedBlock;
 use futuresdr::runtime::WorkIo;
 
 pub struct FftShift<T> {
@@ -18,8 +18,8 @@ pub struct FftShift<T> {
 
 impl<T: Copy + Send + 'static> FftShift<T> {
     #[allow(clippy::new_ret_no_self)]
-    pub fn new() -> Block {
-        Block::new(
+    pub fn new() -> TypedBlock<Self> {
+        TypedBlock::new(
             BlockMetaBuilder::new("FftShift").build(),
             StreamIoBuilder::new()
                 .add_input::<T>("in")

examples/audio/play_file.rs

@@ -8,8 +8,7 @@ fn main() -> Result<()> {
     let mut fg = Flowgraph::new();
 
     let src = FileSource::new("rick.mp3");
-    let inner = src.kernel::<FileSource>().unwrap();
-    let snk = AudioSink::new(inner.sample_rate(), inner.channels());
+    let snk = AudioSink::new(src.kernel.sample_rate(), src.kernel.channels());
 
     let src = fg.add_block(src)?;
     let snk = fg.add_block(snk)?;

examples/audio/play_selectable_tone.rs

@@ -5,6 +5,7 @@ use futuresdr::blocks::audio::AudioSink;
 use futuresdr::blocks::Selector;
 use futuresdr::blocks::SelectorDropPolicy as DropPolicy;
 use futuresdr::blocks::SignalSourceBuilder;
+use futuresdr::runtime::BlockT;
 use futuresdr::runtime::Flowgraph;
 use futuresdr::runtime::Pmt;
 use futuresdr::runtime::Runtime;

examples/audio/play_stereo.rs

@@ -13,12 +13,15 @@ fn main() -> Result<()> {
     let mut fg = Flowgraph::new();
 
     let src = FileSource::new("rick.mp3");
-    let inner = src.kernel::<FileSource>().unwrap();
 
     // resample to 48kHz
-    let resample = FirBuilder::resampling::<f32, f32>(48_000, inner.sample_rate() as usize);
+    let resample = FirBuilder::resampling::<f32, f32>(48_000, src.kernel.sample_rate() as usize);
 
-    assert_eq!(inner.channels(), 1, "We expect mp3 to be single channel.");
+    assert_eq!(
+        src.kernel.channels(),
+        1,
+        "We expect mp3 to be single channel."
+    );
     let mono_to_stereo = ApplyNM::<_, _, _, 1, 2>::new(move |v: &[f32], d: &mut [f32]| {
         d[0] = v[0] * GAIN_L;
         d[1] = v[0] * GAIN_R;

examples/ctrlport-demo.rs

@@ -1,7 +1,6 @@
 use futuresdr::anyhow::Result;
 use futuresdr::macros::async_trait;
 use futuresdr::macros::message_handler;
-use futuresdr::runtime::Block;
 use futuresdr::runtime::BlockMeta;
 use futuresdr::runtime::BlockMetaBuilder;
 use futuresdr::runtime::Flowgraph;
@@ -11,6 +10,7 @@ use futuresdr::runtime::MessageIoBuilder;
 use futuresdr::runtime::Pmt;
 use futuresdr::runtime::Runtime;
 use futuresdr::runtime::StreamIoBuilder;
+use futuresdr::runtime::TypedBlock;
 use futuresdr::runtime::WorkIo;
 
 fn main() -> Result<()> {
@@ -28,8 +28,8 @@ pub struct CtrlPortDemo {
 
 impl CtrlPortDemo {
     #[allow(clippy::new_ret_no_self)]
-    pub fn new() -> Block {
-        Block::new(
+    pub fn new() -> TypedBlock<Self> {
+        TypedBlock::new(
             BlockMetaBuilder::new("CtrlPortDemo").build(),
             StreamIoBuilder::new().build(),
             MessageIoBuilder::new()

examples/debug/panic.rs

@@ -5,7 +5,6 @@ use futuresdr::anyhow::Result;
 use futuresdr::macros::async_trait;
 use futuresdr::macros::connect;
 use futuresdr::runtime::scheduler;
-use futuresdr::runtime::Block;
 use futuresdr::runtime::BlockMeta;
 use futuresdr::runtime::BlockMetaBuilder;
 use futuresdr::runtime::Flowgraph;
@@ -15,6 +14,7 @@ use futuresdr::runtime::MessageIoBuilder;
 use futuresdr::runtime::Runtime;
 use futuresdr::runtime::StreamIo;
 use futuresdr::runtime::StreamIoBuilder;
+use futuresdr::runtime::TypedBlock;
 use futuresdr::runtime::WorkIo;
 
 #[derive(Debug, Clone, ValueEnum)]
@@ -69,8 +69,8 @@ struct Panic {
 
 impl Panic {
     #[allow(clippy::new_ret_no_self)]
-    pub fn new(w: PanicWhere) -> Block {
-        Block::new(
+    pub fn new(w: PanicWhere) -> TypedBlock<Self> {
+        TypedBlock::new(
             BlockMetaBuilder::new("Panic").build(),
             StreamIoBuilder::new().build(),
             MessageIoBuilder::<Self>::new().build(),

examples/debug/tag_debug.rs

@@ -2,7 +2,6 @@ use futuresdr::anyhow::Result;
 use futuresdr::blocks::TagDebug;
 use futuresdr::blocks::VectorSource;
 use futuresdr::macros::async_trait;
-use futuresdr::runtime::Block;
 use futuresdr::runtime::BlockMeta;
 use futuresdr::runtime::BlockMetaBuilder;
 use futuresdr::runtime::Flowgraph;
@@ -13,6 +12,7 @@ use futuresdr::runtime::Runtime;
 use futuresdr::runtime::StreamIo;
 use futuresdr::runtime::StreamIoBuilder;
 use futuresdr::runtime::Tag;
+use futuresdr::runtime::TypedBlock;
 use futuresdr::runtime::WorkIo;
 
 fn main() -> Result<()> {
@@ -44,8 +44,8 @@ pub struct PeriodicTagger {
 
 impl PeriodicTagger {
     #[allow(clippy::new_ret_no_self)]
-    pub fn new(period: usize) -> Block {
-        Block::new(
+    pub fn new(period: usize) -> TypedBlock<Self> {
+        TypedBlock::new(
             BlockMetaBuilder::new("PeriodicTagger").build(),
             StreamIoBuilder::new()
                 .add_input::<f32>("in")

examples/egui/src/channel_sink.rs

@@ -1,14 +1,14 @@
 use futuresdr::anyhow::Result;
 use futuresdr::futures::channel::mpsc::Sender;
 use futuresdr::macros::async_trait;
-use futuresdr::runtime::Block;
 use futuresdr::runtime::BlockMeta;
 use futuresdr::runtime::BlockMetaBuilder;
 use futuresdr::runtime::Kernel;
 use futuresdr::runtime::MessageIo;
 use futuresdr::runtime::MessageIoBuilder;
 use futuresdr::runtime::StreamIo;
 use futuresdr::runtime::StreamIoBuilder;
+use futuresdr::runtime::TypedBlock;
 use futuresdr::runtime::WorkIo;
 
 use crate::FFT_SIZE;
@@ -18,8 +18,8 @@ pub struct ChannelSink {
 }
 
 impl ChannelSink {
-    pub fn new(tx: Sender<Box<[f32; FFT_SIZE]>>) -> Block {
-        Block::new(
+    pub fn new(tx: Sender<Box<[f32; FFT_SIZE]>>) -> TypedBlock<Self> {
+        TypedBlock::new(
             BlockMetaBuilder::new("ChannelSink").build(),
             StreamIoBuilder::new().add_input::<f32>("in").build(),
             MessageIoBuilder::<Self>::new().build(),

examples/firdes/src/main.rs

@@ -1,6 +1,7 @@
 use futuresdr::blocks::audio::AudioSink;
 use futuresdr::blocks::FirBuilder;
 use futuresdr::blocks::Source;
+use futuresdr::runtime::Block;
 use futuresdr::runtime::Flowgraph;
 use futuresdr::runtime::Runtime;
 
@@ -41,9 +42,9 @@ fn main() -> Result<()> {
         firdes::kaiser::bandpass::<f32>(lower_cutoff, higher_cutoff, transition_bw, max_ripple);
     println!("Filter has {} taps", filter_taps.len());
 
-    let filter_block = match enable_filter {
-        true => FirBuilder::new::<f32, f32, _>(filter_taps),
-        _ => FirBuilder::new::<f32, f32, _>([1.0_f32]),
+    let filter_block: Block = match enable_filter {
+        true => FirBuilder::new::<f32, f32, _>(filter_taps).into(),
+        _ => FirBuilder::new::<f32, f32, _>([1.0_f32]).into(),
     };
 
     let snk = AudioSink::new(DOWNSAMPLED_FREQ, 1);

examples/keyfob/src/decoder.rs

@@ -1,13 +1,13 @@
 use futuresdr::anyhow::Result;
 use futuresdr::macros::async_trait;
-use futuresdr::runtime::Block;
 use futuresdr::runtime::BlockMeta;
 use futuresdr::runtime::BlockMetaBuilder;
 use futuresdr::runtime::Kernel;
 use futuresdr::runtime::MessageIo;
 use futuresdr::runtime::MessageIoBuilder;
 use futuresdr::runtime::StreamIo;
 use futuresdr::runtime::StreamIoBuilder;
+use futuresdr::runtime::TypedBlock;
 use futuresdr::runtime::WorkIo;
 use futuresdr::tracing::info;
 
@@ -25,8 +25,8 @@ pub struct Decoder {
 }
 
 impl Decoder {
-    pub fn new() -> Block {
-        Block::new(
+    pub fn new() -> TypedBlock<Self> {
+        TypedBlock::new(
             BlockMetaBuilder::new("Decoder").build(),
             StreamIoBuilder::new().add_input::<u8>("in").build(),
             MessageIoBuilder::<Self>::new().build(),

examples/keyfob/src/main.rs

@@ -8,6 +8,7 @@ use futuresdr::futuredsp::firdes;
 use futuresdr::futuredsp::windows;
 use futuresdr::macros::connect;
 use futuresdr::num_complex::Complex32;
+use futuresdr::runtime::Block;
 use futuresdr::runtime::Flowgraph;
 use futuresdr::runtime::Runtime;
 
@@ -39,8 +40,8 @@ fn main() -> Result<()> {
 
     let mut fg = Flowgraph::new();
 
-    let src = match args.file {
-        Some(file) => FileSource::<Complex32>::new(file, false),
+    let src: Block = match args.file {
+        Some(file) => FileSource::<Complex32>::new(file, false).into(),
         None => {
             let mut src = SourceBuilder::new()
                 .sample_rate(args.sample_rate)

examples/lora/src/bin/loopback.rs

@@ -1,18 +1,18 @@
-use std::fmt::Debug;
-use std::time::Duration;
-
 use clap::Parser;
-
 use futuresdr::anyhow::anyhow;
 use futuresdr::anyhow::Result;
 use futuresdr::async_io::Timer;
 use futuresdr::blocks::BlobToUdp;
 use futuresdr::macros::connect;
 use futuresdr::runtime::buffer::circular::Circular;
+use futuresdr::runtime::BlockT;
 use futuresdr::runtime::Flowgraph;
 use futuresdr::runtime::Pmt;
 use futuresdr::runtime::Runtime;
 use futuresdr::tracing::info;
+use std::fmt::Debug;
+use std::time::Duration;
+
 use lora::utils::Bandwidth;
 use lora::utils::CodeRate;
 use lora::utils::SpreadingFactor;

examples/lora/src/bin/tx.rs

@@ -3,6 +3,7 @@ use futuresdr::anyhow::Result;
 use futuresdr::async_io::Timer;
 use futuresdr::blocks::seify::SinkBuilder;
 use futuresdr::macros::connect;
+use futuresdr::runtime::BlockT;
 use futuresdr::runtime::Flowgraph;
 use futuresdr::runtime::Pmt;
 use futuresdr::runtime::Runtime;

examples/lora/src/bin/tx_meshtastic.rs

@@ -2,6 +2,7 @@ use clap::Parser;
 use futuresdr::anyhow::Result;
 use futuresdr::blocks::seify::SinkBuilder;
 use futuresdr::macros::connect;
+use futuresdr::runtime::BlockT;
 use futuresdr::runtime::Flowgraph;
 use futuresdr::runtime::Pmt;
 use futuresdr::runtime::Runtime;