aboutsummaryrefslogtreecommitdiffstats
path: root/nihav-core/src/demuxers
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shiskov@gmail.com>2020-09-27 13:24:03 +0200
committerKostya Shishkov <kostya.shiskov@gmail.com>2020-09-27 13:24:03 +0200
commitac818eac7671fa8ddfea5aa4fb86fc0b5ab82d2e (patch)
tree5ac952c45b747fbe5df9c71b08237a409d9f1d7a /nihav-core/src/demuxers
parent73f0f89ff3a3616a8e65b5a31c2303725994c56a (diff)
downloadnihav-ac818eac7671fa8ddfea5aa4fb86fc0b5ab82d2e.tar.gz
fix some warnings (unneeded parentheses, missing dyn keyword)
Diffstat (limited to 'nihav-core/src/demuxers')
-rw-r--r--nihav-core/src/demuxers/mod.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/nihav-core/src/demuxers/mod.rs b/nihav-core/src/demuxers/mod.rs
index 352c160..b54e563 100644
--- a/nihav-core/src/demuxers/mod.rs
+++ b/nihav-core/src/demuxers/mod.rs
@@ -88,7 +88,7 @@ impl StreamManager {
/// Adds a new stream.
pub fn add_stream(&mut self, stream: NAStream) -> Option<usize> {
let stream_num = self.streams.len();
- let mut str = stream.clone();
+ let mut str = stream;
str.set_num(stream_num);
self.streams.push(str.into_ref());
self.ignored.push(false);
@@ -442,7 +442,7 @@ pub trait DemuxerCreator {
}
/// Creates demuxer for a provided bytestream.
-pub fn create_demuxer<'a>(dmxcr: &DemuxerCreator, br: &'a mut ByteReader<'a>) -> DemuxerResult<Demuxer<'a>> {
+pub fn create_demuxer<'a>(dmxcr: &dyn DemuxerCreator, br: &'a mut ByteReader<'a>) -> DemuxerResult<Demuxer<'a>> {
let mut dmx = dmxcr.new_demuxer(br);
let mut str = StreamManager::new();
let mut seek_idx = SeekIndex::new();
@@ -453,7 +453,7 @@ pub fn create_demuxer<'a>(dmxcr: &DemuxerCreator, br: &'a mut ByteReader<'a>) ->
/// List of registered demuxers.
#[derive(Default)]
pub struct RegisteredDemuxers {
- dmxs: Vec<&'static DemuxerCreator>,
+ dmxs: Vec<&'static dyn DemuxerCreator>,
}
impl RegisteredDemuxers {
@@ -462,11 +462,11 @@ impl RegisteredDemuxers {
Self { dmxs: Vec::new() }
}
/// Registers a new demuxer.
- pub fn add_demuxer(&mut self, dmx: &'static DemuxerCreator) {
+ pub fn add_demuxer(&mut self, dmx: &'static dyn DemuxerCreator) {
self.dmxs.push(dmx);
}
/// Searches for a demuxer that supports requested container format.
- pub fn find_demuxer(&self, name: &str) -> Option<&DemuxerCreator> {
+ pub fn find_demuxer(&self, name: &str) -> Option<&dyn DemuxerCreator> {
for &dmx in self.dmxs.iter() {
if dmx.get_name() == name {
return Some(dmx);
@@ -475,7 +475,7 @@ impl RegisteredDemuxers {
None
}
/// Provides an iterator over currently registered demuxers.
- pub fn iter(&self) -> std::slice::Iter<&DemuxerCreator> {
+ pub fn iter(&self) -> std::slice::Iter<&dyn DemuxerCreator> {
self.dmxs.iter()
}
}