Mirrors/lofty-rs
2
0
Fork 0
mirror of https://github.com/Serial-ATA/lofty-rs synced 2025-03-04 23:07:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Create logic::iff

Browse source
This commit is contained in:
Serial 2021-07-28 13:34:25 -04:00
parent 6230a0ff09
commit 438467f35e
7 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
src/components/logic/aiff.rs → src/components/logic/iff/aiff.rs
View file

4
src/components/logic/iff/mod.rs Normal file
View file

@ -0,0 +1,4 @@
#[cfg(any(feature = "format-aiff", feature = "format-id3"))]
pub(crate) mod aiff;
#[cfg(any(feature = "format-riff", feature = "format-id3"))]
pub(crate) mod riff;

0
src/components/logic/riff.rs → src/components/logic/iff/riff.rs
View file

5
src/components/logic/mod.rs
View file

@ -1,6 +1,3 @@
#[cfg(feature = "format-riff")]
pub(crate) mod riff;
#[cfg(any(
feature = "format-opus",
feature = "format-vorbis",
@ -9,4 +6,4 @@ pub(crate) mod riff;
pub(crate) mod ogg;
#[cfg(any(feature = "format-aiff", feature = "format-id3"))]
pub(crate) mod aiff;
pub(crate) mod iff;

4
src/components/tags/aiff_tag.rs
View file

@ -1,5 +1,5 @@
use crate::components::logic::aiff;
use crate::components::logic::aiff::AiffMetadataType;
use crate::components::logic::iff::aiff;
use crate::components::logic::iff::aiff::AiffMetadataType;
use crate::{
Album, AnyTag, AudioTag, AudioTagEdit, AudioTagWrite, FileProperties, Result, TagType, ToAny,
ToAnyTag,

6
src/components/tags/id3_tag.rs
View file

@ -1,5 +1,5 @@
use crate::components::logic::aiff;
use crate::components::logic::aiff::AiffMetadataType;
use crate::components::logic::iff;
use crate::components::logic::iff::aiff::AiffMetadataType;
use crate::tag::Id3Format;
use crate::{
Album, AnyTag, AudioTag, AudioTagEdit, AudioTagWrite, FileProperties, LoftyError, MimeType,
@ -41,7 +41,7 @@ impl Id3v2Tag {
Id3v2InnerTag::read_from_wav_reader(reader)?,
),
Id3Format::Aiff => {
let (data, properties) = aiff::read_from(reader, true)?;
let (data, properties) = iff::aiff::read_from(reader, true)?;
let inner = match data {
Some(AiffMetadataType::Id3(id3_data)) => {

2
src/components/tags/riff_tag.rs
View file

@ -1,4 +1,4 @@
use crate::components::logic::riff;
use crate::components::logic::iff::riff;
use crate::{
Album, AnyTag, AudioTag, AudioTagEdit, AudioTagWrite, FileProperties, Result, TagType, ToAny,
ToAnyTag,