X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=wavpack.git;a=blobdiff_plain;f=Codec%2FAudio%2FWavPack%2FMetadata.hs;h=def1cb3c422b14d085af14ed9568d5797117df74;hp=fcd873b5776ef17f7ad1767e1328848a0a978ad6;hb=a35118daab8f022314c67b6d611b6ae0a7622fad;hpb=16211cdd0d7ebd32f10e224ab11bebc8be6fecb5 diff --git a/Codec/Audio/WavPack/Metadata.hs b/Codec/Audio/WavPack/Metadata.hs index fcd873b..def1cb3 100644 --- a/Codec/Audio/WavPack/Metadata.hs +++ b/Codec/Audio/WavPack/Metadata.hs @@ -20,7 +20,6 @@ module Codec.Audio.WavPack.Metadata , Unknown(..) ) where -import qualified Codec.Audio.WavPack.BitString as B import Codec.Audio.WavPack.Internal import Control.Monad import Data.Binary @@ -275,17 +274,17 @@ instance Binary EntropyVars where -- | WV Bitstream data WVBitstream = WVBitstream { - wvStream ∷ !B.BitString + wvStream ∷ !L.ByteString } deriving (Eq, Show, Typeable) instance Metadata WVBitstream where metaID _ = 0x0A - metaSize = (`div` 8) ∘ B.length ∘ wvStream + metaSize = fromIntegral ∘ L.length ∘ wvStream instance Binary WVBitstream where - put = putLazyByteString ∘ B.toByteString ∘ wvStream - get = fmap (WVBitstream ∘ B.fromByteString) getRemainingLazyByteString + put = putLazyByteString ∘ wvStream + get = fmap WVBitstream getRemainingLazyByteString -- | RIFF header for .wav files (before audio) data RIFFHeader