aboutsummaryrefslogtreecommitdiffstats
path: root/nihav-game/src
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2019-05-14 09:34:52 +0200
committerKostya Shishkov <kostya.shishkov@gmail.com>2019-05-14 09:34:52 +0200
commit6011e20199143f519881660144a4ca95ba77fd2d (patch)
treea4ca902a724f0601ee116b139b77198503270f5e /nihav-game/src
parent3a1d1cfa508161305c7e2499dab3196ded109faf (diff)
downloadnihav-6011e20199143f519881660144a4ca95ba77fd2d.tar.gz
mark traits as dyn
Diffstat (limited to 'nihav-game/src')
-rw-r--r--nihav-game/src/codecs/bmv.rs4
-rw-r--r--nihav-game/src/codecs/bmv3.rs4
-rw-r--r--nihav-game/src/codecs/gremlinvideo.rs4
-rw-r--r--nihav-game/src/codecs/vmd.rs4
-rw-r--r--nihav-game/src/demuxers/bmv.rs4
-rw-r--r--nihav-game/src/demuxers/gdv.rs2
-rw-r--r--nihav-game/src/demuxers/vmd.rs2
7 files changed, 12 insertions, 12 deletions
diff --git a/nihav-game/src/codecs/bmv.rs b/nihav-game/src/codecs/bmv.rs
index 970f490..eb228bb 100644
--- a/nihav-game/src/codecs/bmv.rs
+++ b/nihav-game/src/codecs/bmv.rs
@@ -225,7 +225,7 @@ impl NADecoder for BMVVideoDecoder {
}
-pub fn get_decoder_video() -> Box<NADecoder> {
+pub fn get_decoder_video() -> Box<dyn NADecoder> {
Box::new(BMVVideoDecoder::new())
}
@@ -301,7 +301,7 @@ impl NADecoder for BMVAudioDecoder {
}
}
-pub fn get_decoder_audio() -> Box<NADecoder> {
+pub fn get_decoder_audio() -> Box<dyn NADecoder> {
Box::new(BMVAudioDecoder::new())
}
diff --git a/nihav-game/src/codecs/bmv3.rs b/nihav-game/src/codecs/bmv3.rs
index f6067cf..b30628e 100644
--- a/nihav-game/src/codecs/bmv3.rs
+++ b/nihav-game/src/codecs/bmv3.rs
@@ -509,7 +509,7 @@ impl NADecoder for BMV3VideoDecoder {
}
-pub fn get_decoder_video() -> Box<NADecoder> {
+pub fn get_decoder_video() -> Box<dyn NADecoder> {
Box::new(BMV3VideoDecoder::new())
}
@@ -598,7 +598,7 @@ impl NADecoder for BMV3AudioDecoder {
}
}
-pub fn get_decoder_audio() -> Box<NADecoder> {
+pub fn get_decoder_audio() -> Box<dyn NADecoder> {
Box::new(BMV3AudioDecoder::new())
}
diff --git a/nihav-game/src/codecs/gremlinvideo.rs b/nihav-game/src/codecs/gremlinvideo.rs
index 2d698cb..19021ee 100644
--- a/nihav-game/src/codecs/gremlinvideo.rs
+++ b/nihav-game/src/codecs/gremlinvideo.rs
@@ -460,7 +460,7 @@ impl NADecoder for GremlinVideoDecoder {
}
}
-pub fn get_decoder_video() -> Box<NADecoder> {
+pub fn get_decoder_video() -> Box<dyn NADecoder> {
Box::new(GremlinVideoDecoder::new())
}
@@ -552,7 +552,7 @@ impl NADecoder for GremlinAudioDecoder {
}
}
-pub fn get_decoder_audio() -> Box<NADecoder> {
+pub fn get_decoder_audio() -> Box<dyn NADecoder> {
Box::new(GremlinAudioDecoder::new())
}
diff --git a/nihav-game/src/codecs/vmd.rs b/nihav-game/src/codecs/vmd.rs
index a11e26c..ea6c31d 100644
--- a/nihav-game/src/codecs/vmd.rs
+++ b/nihav-game/src/codecs/vmd.rs
@@ -269,7 +269,7 @@ impl NADecoder for VMDVideoDecoder {
}
-pub fn get_decoder_video() -> Box<NADecoder> {
+pub fn get_decoder_video() -> Box<dyn NADecoder> {
Box::new(VMDVideoDecoder::new())
}
@@ -440,7 +440,7 @@ impl NADecoder for VMDAudioDecoder {
}
}
-pub fn get_decoder_audio() -> Box<NADecoder> {
+pub fn get_decoder_audio() -> Box<dyn NADecoder> {
Box::new(VMDAudioDecoder::new())
}
diff --git a/nihav-game/src/demuxers/bmv.rs b/nihav-game/src/demuxers/bmv.rs
index ea06d7f..6ef023b 100644
--- a/nihav-game/src/demuxers/bmv.rs
+++ b/nihav-game/src/demuxers/bmv.rs
@@ -93,7 +93,7 @@ impl<'a> BMVDemuxer<'a> {
pub struct BMVDemuxerCreator { }
impl DemuxerCreator for BMVDemuxerCreator {
- fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box<DemuxCore<'a> + 'a> {
+ fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box<dyn DemuxCore<'a> + 'a> {
Box::new(BMVDemuxer::new(br))
}
fn get_name(&self) -> &'static str { "bmv" }
@@ -239,7 +239,7 @@ impl<'a> BMV3Demuxer<'a> {
pub struct BMV3DemuxerCreator { }
impl DemuxerCreator for BMV3DemuxerCreator {
- fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box<DemuxCore<'a> + 'a> {
+ fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box<dyn DemuxCore<'a> + 'a> {
Box::new(BMV3Demuxer::new(br))
}
fn get_name(&self) -> &'static str { "bmv3" }
diff --git a/nihav-game/src/demuxers/gdv.rs b/nihav-game/src/demuxers/gdv.rs
index 665058e..6fde92b 100644
--- a/nihav-game/src/demuxers/gdv.rs
+++ b/nihav-game/src/demuxers/gdv.rs
@@ -162,7 +162,7 @@ pktdta: Vec::new(),
pub struct GDVDemuxerCreator { }
impl DemuxerCreator for GDVDemuxerCreator {
- fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box<DemuxCore<'a> + 'a> {
+ fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box<dyn DemuxCore<'a> + 'a> {
Box::new(GremlinVideoDemuxer::new(br))
}
fn get_name(&self) -> &'static str { "gdv" }
diff --git a/nihav-game/src/demuxers/vmd.rs b/nihav-game/src/demuxers/vmd.rs
index b670b63..80c503a 100644
--- a/nihav-game/src/demuxers/vmd.rs
+++ b/nihav-game/src/demuxers/vmd.rs
@@ -171,7 +171,7 @@ impl<'a> VMDDemuxer<'a> {
pub struct VMDDemuxerCreator { }
impl DemuxerCreator for VMDDemuxerCreator {
- fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box<DemuxCore<'a> + 'a> {
+ fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box<dyn DemuxCore<'a> + 'a> {
Box::new(VMDDemuxer::new(br))
}
fn get_name(&self) -> &'static str { "vmd" }