From 7674ac72623bdec1fbda1b451c8379aee015c984 Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Sat, 31 Jan 2026 16:19:41 +0100 Subject: [PATCH] sndplay: use immediate crate names in register_xxx functions There is no need to import it explicity if it gets used just in one place. --- sndplay/src/allreg.rs | 125 ++++++++++++++++-------------------------- 1 file changed, 47 insertions(+), 78 deletions(-) rewrite sndplay/src/allreg.rs (70%) diff --git a/sndplay/src/allreg.rs b/sndplay/src/allreg.rs dissimilarity index 70% index 5273e6c..71495be 100644 --- a/sndplay/src/allreg.rs +++ b/sndplay/src/allreg.rs @@ -1,78 +1,47 @@ -use nihav_hlblocks::demux::FullRegister; - -use nihav_core::codecs::{RegisteredDecoders, RegisteredPacketisers}; -use nihav_core::demuxers::{RegisteredDemuxers, RegisteredRawDemuxers}; - -use nihav_commonfmt::generic_register_all_decoders; -use nihav_commonfmt::generic_register_all_demuxers; - -use nihav_duck::duck_register_all_decoders; - -use nihav_flash::flash_register_all_decoders; -use nihav_flash::flash_register_all_demuxers; - -use nihav_game::game_register_all_decoders; -use nihav_game::game_register_all_demuxers; - -use nihav_indeo::indeo_register_all_decoders; - -use nihav_llaudio::llaudio_register_all_decoders; -use nihav_llaudio::llaudio_register_all_demuxers; - -use nihav_mpeg::mpeg_register_all_decoders; -use nihav_mpeg::mpeg_register_all_packetisers; - -use nihav_ms::ms_register_all_decoders; - -use nihav_qt::qt_register_all_decoders; - -use nihav_rad::rad_register_all_decoders; -use nihav_rad::rad_register_all_demuxers; - -use nihav_realmedia::realmedia_register_all_decoders; -use nihav_realmedia::realmedia_register_all_demuxers; - -use nihav_vivo::vivo_register_all_decoders; -use nihav_vivo::vivo_register_all_demuxers; - -fn register_all_decoders(rd: &mut RegisteredDecoders) { - generic_register_all_decoders(rd); - duck_register_all_decoders(rd); - flash_register_all_decoders(rd); - game_register_all_decoders(rd); - indeo_register_all_decoders(rd); - llaudio_register_all_decoders(rd); - mpeg_register_all_decoders(rd); - ms_register_all_decoders(rd); - qt_register_all_decoders(rd); - rad_register_all_decoders(rd); - realmedia_register_all_decoders(rd); - vivo_register_all_decoders(rd); -} - -fn register_all_packetisers(rp: &mut RegisteredPacketisers) { - mpeg_register_all_packetisers(rp); -} - -fn register_all_demuxers(rd: &mut RegisteredDemuxers) { - generic_register_all_demuxers(rd); - flash_register_all_demuxers(rd); - game_register_all_demuxers(rd); - llaudio_register_all_demuxers(rd); - rad_register_all_demuxers(rd); - realmedia_register_all_demuxers(rd); - vivo_register_all_demuxers(rd); -} - -fn register_all_raw_demuxers(_rd: &mut RegisteredRawDemuxers) { - //llaudio_register_all_raw_demuxers(rd); -} - - -pub fn fill_register(reg: &mut FullRegister) { - register_all_demuxers(&mut reg.dmx_reg); - register_all_raw_demuxers(&mut reg.rdmx_reg); - register_all_decoders(&mut reg.dec_reg); - register_all_packetisers(&mut reg.pkt_reg); -} - +use nihav_hlblocks::demux::FullRegister; + +use nihav_core::codecs::{RegisteredDecoders, RegisteredPacketisers}; +use nihav_core::demuxers::{RegisteredDemuxers, RegisteredRawDemuxers}; + +fn register_all_decoders(rd: &mut RegisteredDecoders) { + nihav_commonfmt::generic_register_all_decoders(rd); + nihav_duck::duck_register_all_decoders(rd); + nihav_flash::flash_register_all_decoders(rd); + nihav_game::game_register_all_decoders(rd); + nihav_indeo::indeo_register_all_decoders(rd); + nihav_llaudio::llaudio_register_all_decoders(rd); + nihav_mpeg::mpeg_register_all_decoders(rd); + nihav_ms::ms_register_all_decoders(rd); + nihav_qt::qt_register_all_decoders(rd); + nihav_rad::rad_register_all_decoders(rd); + nihav_realmedia::realmedia_register_all_decoders(rd); + nihav_vivo::vivo_register_all_decoders(rd); +} + +fn register_all_packetisers(rp: &mut RegisteredPacketisers) { + nihav_mpeg::mpeg_register_all_packetisers(rp); +} + +fn register_all_demuxers(rd: &mut RegisteredDemuxers) { + nihav_commonfmt::generic_register_all_demuxers(rd); + nihav_flash::flash_register_all_demuxers(rd); + nihav_game::game_register_all_demuxers(rd); + nihav_indeo::indeo_register_all_demuxers(rd); + nihav_llaudio::llaudio_register_all_demuxers(rd); + nihav_rad::rad_register_all_demuxers(rd); + nihav_realmedia::realmedia_register_all_demuxers(rd); + nihav_vivo::vivo_register_all_demuxers(rd); +} + +fn register_all_raw_demuxers(_rd: &mut RegisteredRawDemuxers) { + //llaudio_register_all_raw_demuxers(rd); +} + + +pub fn fill_register(reg: &mut FullRegister) { + register_all_demuxers(&mut reg.dmx_reg); + register_all_raw_demuxers(&mut reg.rdmx_reg); + register_all_decoders(&mut reg.dec_reg); + register_all_packetisers(&mut reg.pkt_reg); +} + -- 2.39.5