X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-core%2Fsrc%2Fmuxers%2Fmod.rs;h=e8334e52a83a459ab08f4bbeff0b1d57caae77a8;hp=40a6eb353f919f7cb5f7d3a601d82222b32af170;hb=405cec9eed5d7f58440ec8495f5cbc1f5c6fee40;hpb=f638a5b1b3241b3433689983aca22d9e6518a64f diff --git a/nihav-core/src/muxers/mod.rs b/nihav-core/src/muxers/mod.rs index 40a6eb3..e8334e5 100644 --- a/nihav-core/src/muxers/mod.rs +++ b/nihav-core/src/muxers/mod.rs @@ -74,10 +74,10 @@ pub struct Muxer<'a> { impl<'a> Muxer<'a> { /// Constructs a new `Muxer` instance. - fn new(mux: Box + 'a>, str: StreamManager) -> Self { + fn new(mux: Box + 'a>, strmgr: StreamManager) -> Self { Muxer { mux, - streams: str, + streams: strmgr, } } /// Returns a stream reference by its number. @@ -134,10 +134,10 @@ pub trait MuxerCreator { } /// Creates muxer for a provided bytestream writer. -pub fn create_muxer<'a>(mxcr: &dyn MuxerCreator, str: StreamManager, bw: &'a mut ByteWriter<'a>) -> MuxerResult> { +pub fn create_muxer<'a>(mxcr: &dyn MuxerCreator, strmgr: StreamManager, bw: &'a mut ByteWriter<'a>) -> MuxerResult> { let mut mux = mxcr.new_muxer(bw); - mux.create(&str)?; - Ok(Muxer::new(mux, str)) + mux.create(&strmgr)?; + Ok(Muxer::new(mux, strmgr)) } /// List of registered muxers.