From 612c3d15be2b300978d596735edc8f033144410c Mon Sep 17 00:00:00 2001 From: Luro02 <24826124+Luro02@users.noreply.github.com> Date: Tue, 17 Sep 2019 15:40:10 +0200 Subject: [PATCH] minor protocol_version fixes --- src/master_playlist.rs | 2 +- src/media_playlist.rs | 2 +- src/types/initialization_vector.rs | 1 + src/types/protocol_version.rs | 9 +++++++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/master_playlist.rs b/src/master_playlist.rs index ec11a86..418cdb6 100644 --- a/src/master_playlist.rs +++ b/src/master_playlist.rs @@ -158,7 +158,7 @@ impl MasterPlaylistBuilder { .flatten(), ) .max() - .unwrap_or(ProtocolVersion::V7) + .unwrap_or(ProtocolVersion::latest()) } fn validate_stream_inf_tags(&self) -> crate::Result<()> { diff --git a/src/media_playlist.rs b/src/media_playlist.rs index 9d9778e..3f673c0 100644 --- a/src/media_playlist.rs +++ b/src/media_playlist.rs @@ -200,7 +200,7 @@ impl MediaPlaylistBuilder { .unwrap_or(ProtocolVersion::V1) })) .max() - .unwrap_or(ProtocolVersion::V1) + .unwrap_or(ProtocolVersion::latest()) } /// Adds a media segment to the resulting playlist. diff --git a/src/types/initialization_vector.rs b/src/types/initialization_vector.rs index 8b008a7..7c64323 100644 --- a/src/types/initialization_vector.rs +++ b/src/types/initialization_vector.rs @@ -13,6 +13,7 @@ use crate::Error; pub struct InitializationVector(pub [u8; 16]); impl InitializationVector { + /// Converts the initialization vector to a slice. pub const fn to_slice(&self) -> [u8; 16] { self.0 } diff --git a/src/types/protocol_version.rs b/src/types/protocol_version.rs index 40092ed..1d54938 100644 --- a/src/types/protocol_version.rs +++ b/src/types/protocol_version.rs @@ -17,6 +17,14 @@ pub enum ProtocolVersion { V6, V7, } + +impl ProtocolVersion { + /// Returns the newest ProtocolVersion, that is supported by this library. + pub const fn latest() -> Self { + Self::V7 + } +} + impl fmt::Display for ProtocolVersion { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { let n = { @@ -33,6 +41,7 @@ impl fmt::Display for ProtocolVersion { write!(f, "{}", n) } } + impl FromStr for ProtocolVersion { type Err = Error;