Merge pull request #7 from ssfrr/06_depwarns_windows

Removes units, updates for 0.6 and latest SampledSignals

Author: ssfrr

.travis.yml

@@ -5,8 +5,7 @@ os:
   - linux
   - osx
 julia:
-  - 0.5
-  - 0.4
+  - 0.6
 notifications:
   email: false
 # uncomment the following lines to override the default test script

REQUIRE

@@ -1,8 +1,6 @@
-julia 0.4
+julia 0.6-
 BinDeps
 FileIO
 FixedPointNumbers
-SampledSignals 0.2.0
-SIUnits
+SampledSignals 1.0.0
 @osx Homebrew
-Compat 0.8.8

appveyor.yml

@@ -1,9 +1,7 @@
 environment:
   matrix:
-  - JULIAVERSION: "julialang/bin/winnt/x86/0.4/julia-0.4-latest-win32.exe"
-  - JULIAVERSION: "julialang/bin/winnt/x64/0.4/julia-0.4-latest-win64.exe"
-  - JULIAVERSION: "julialang/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
-  - JULIAVERSION: "julialang/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
 
 notifications:
   - provider: Email
@@ -12,9 +10,10 @@ notifications:
     on_build_status_changed: false
 
 install:
+  - ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
 # Download most recent Julia Windows binary
   - ps: (new-object net.webclient).DownloadFile(
-        $("http://s3.amazonaws.com/"+$env:JULIAVERSION),
+        $env:JULIA_URL,
         "C:\projects\julia-binary.exe")
 # Run installer silently, output to C:\projects\julia
   - C:\projects\julia-binary.exe /S /D=C:\projects\julia

deps/build.jl

@@ -1,14 +1,16 @@
 using BinDeps
-using Compat
 
 @BinDeps.setup
 
-mpg123 = library_dependency("libmpg123")
+mpg123 = library_dependency("libmpg123", aliases=["libmpg123", "libmpg123-0"])
 lame = library_dependency("libmp3lame")
 
 provides(AptGet, "libmpg123-dev", mpg123)
 provides(AptGet, "libmp3lame-dev", lame)
 
+provides(Pacman, "mpg123", mpg123)
+provides(Pacman, "lame", lame)
+
 @static if is_apple()
     if Pkg.installed("Homebrew") === nothing
         error("Homebrew package not installed, please run Pkg.add(\"Homebrew\")")
@@ -18,4 +20,24 @@ provides(AptGet, "libmp3lame-dev", lame)
     provides(Homebrew.HB, "lame", lame)
 end
 
+@static if is_windows()
+    if Sys.WORD_SIZE == 32
+        provides(Binaries, URI("http://www.rarewares.org/files/mp3/libmp3lame-3.99.5x86.zip"), lame,
+                 SHA="7bf2a33de715d968e5ef5049b7b18e34b9ae98224842293adcdc6f6f23ad9b76",
+                 unpacked_dir=".")
+        provides(Binaries, URI("http://www.mpg123.org/download/win32/1.24.0/mpg123-1.24.0-x86.zip"), mpg123,
+                 SHA="331a48db899f6405b7728a4fcd9ee3ef0282f1d27d983bdc8b0738314bb780cb",
+                 unpacked_dir="mpg123-1.24.0-x86")
+    elseif Sys.WORD_SIZE == 64
+        provides(Binaries, URI("http://www.rarewares.org/files/mp3/libmp3lame-3.99.5x64.zip"), lame,
+                 SHA="97959980490caa1669b1c4af386c3e23fe4ceed0835c04e328c9a5966e4d2521",
+                 unpacked_dir=".")
+        provides(Binaries, URI("http://www.mpg123.org/download/win64/1.24.0/mpg123-1.24.0-x86-64.zip"), mpg123,
+                 SHA="d3c21a6f62204a8c93c3f48288f6f7b4d7609394daa966f2d1e6c75b30476f85",
+                 unpacked_dir="mpg123-1.24.0-x86-64")
+    else
+        error("System not 32-bit or 64-bit. Something is wrong")
+    end
+end
+
 @BinDeps.install Dict("libmpg123" => :libmpg123, "libmp3lame" => :libmp3lame)

src/MP3.jl

@@ -9,11 +9,6 @@ isfile(deps)? include(deps) : error("MP3 is not properly installed. Please run:
 using SampledSignals
 using FileIO
 using FixedPointNumbers
-using SIUnits
-using SIUnits.ShortUnits
-
-using Compat
-import Compat: UTF8String, view
 
 # methods to override
 import SampledSignals: nchannels, nframes, samplerate, unsafe_read!, unsafe_write
@@ -23,13 +18,6 @@ import FileIO: load, save
 export load, save
 export Hz, kHz, s
 
-# types used for fixed-point 16-bit and 32-bit encoding
-typealias PCM16Sample Fixed{Int16, 15}
-typealias PCM32Sample Fixed{Int32, 31}
-
-# shortcut to SIQuantity type of Hz
-typealias Hertz SIUnits.SIQuantity{Int64,0,0,-1,0,0,0,0,0,0}
-
 type MP3INFO
     nframes::Int64
     nchannels::Int32
@@ -39,7 +27,7 @@ end
 
 """create an MP3INFO object from given audio buffer"""
 function MP3INFO{T}(buf::SampleBuf{T})
-    MP3INFO(size(buf, 1), size(buf, 2), buf.samplerate.val, T)
+    MP3INFO(nframes(buf), nchannels(buf), samplerate(buf), T)
 end
 
 include("readers.jl")

src/lame.jl

@@ -1,10 +1,10 @@
 # lame wrappers of required functions to write mp3 files
 
 """represents the C pointer lame_global_flags*. used by all LAME functions"""
-typealias LAME Ptr{Void}
+const LAME = Ptr{Void}
 
 """meaning of LAME return codes, usually only relevant to lame_encode_buffer families"""
-LAME_ERRORS = Dict{Int, UTF8String}(
+LAME_ERRORS = Dict{Int, String}(
     -1 => "mp3buf was too small",
     -2 => "malloc() problem",
     -3 => "lame_init_params() not called",

src/mpg123.jl

@@ -29,7 +29,7 @@ const MPG123_ENC_ANY = ( MPG123_ENC_SIGNED_16  | MPG123_ENC_UNSIGNED_16
 	                   | MPG123_ENC_FLOAT_32   | MPG123_ENC_FLOAT_64    )
 
 """represents the C pointer mpg123_handle*. used by all mpg123 functions"""
-typealias MPG123 Ptr{Void}
+const MPG123 = Ptr{Void}
 
 const MPG123_DONE               = -12
 const MPG123_NEW_FORMAT         = -11

src/readers.jl

@@ -7,7 +7,7 @@ function initialize_readers()
     mpg123_init()
 end
 
-type MP3FileSource{T} <: SampleSource
+mutable struct MP3FileSource{T} <: SampleSource
     path::AbstractString
     mpg123::MPG123
     info::MP3INFO
@@ -16,12 +16,12 @@ type MP3FileSource{T} <: SampleSource
 end
 
 function MP3FileSource(path::AbstractString, mpg123::MPG123, info::MP3INFO, bufsize::Integer)
-    readbuf = Array(info.datatype, info.nchannels, bufsize)
-    MP3FileSource(path, mpg123, info, 0, readbuf)
+    readbuf = Array{info.datatype}(info.nchannels, bufsize)
+    MP3FileSource(path, mpg123, info, Int64(0), readbuf)
 end
 
 @inline nchannels(source::MP3FileSource) = Int(source.info.nchannels)
-@inline samplerate(source::MP3FileSource) = quantity(Int, Hz)(source.info.samplerate)
+@inline samplerate(source::MP3FileSource) = source.info.samplerate
 @inline nframes(source::MP3FileSource) = source.info.nframes
 @inline Base.eltype{T}(source::MP3FileSource{T}) = T
 
@@ -47,7 +47,7 @@ loads an MP3 file as SampledSignals.SampleBuf.
 function load(file::File{format"MP3"}; blocksize = -1)
     source = loadstream(file; blocksize = blocksize)
     buffer = try
-        readall(source)
+        read(source)
     finally
         close(source)
     end
@@ -106,9 +106,9 @@ function unsafe_read!(source::MP3FileSource, buf::Array, frameoffset, framecount
     nread
 end
 
-@inline function Base.readall(source::MP3FileSource)
-    read(source, nframes(source) - source.pos)
-end
+# @inline function Base.read(source::MP3FileSource)
+#     read(source, nframes(source) - source.pos)
+# end
 
 @inline function Base.close(source::MP3FileSource)
     mpg123_close(source.mpg123)

src/writers.jl

@@ -11,18 +11,22 @@ const MP3_BLOCKFRAMES = 1152
 # max size needed to hold the encoded mp3 data for a full block
 const MP3_BUFBYTES = ceil(Int, 1.25 * MP3_BLOCKFRAMES + 7200)
 
-type MP3FileSink <: SampleSink
+mutable struct MP3FileSink <: SampleSink
     lame::LAME
-    info::MP3INFO
+    samplerate::Int
+    nchannels::Int
     output::IO
+    nframes::Int
     mp3buf::Vector{UInt8}
+end
 
-    MP3FileSink(lame, info, output) = new(lame, info, output, Array(UInt8, MP3_BUFBYTES))
+function MP3FileSink(lame, samplerate, nchannels, output)
+    MP3FileSink(lame, samplerate, nchannels, output, 0, Array{UInt8}(MP3_BUFBYTES))
 end
 
-@inline nchannels(sink::MP3FileSink) = Int(sink.info.nchannels)
-@inline samplerate(sink::MP3FileSink) = quantity(Int, Hz)(sink.info.samplerate)
-@inline nframes(sink::MP3FileSink) = sink.info.nframes
+@inline nchannels(sink::MP3FileSink) = sink.nchannels
+@inline samplerate(sink::MP3FileSink) = sink.samplerate
+@inline nframes(sink::MP3FileSink) = sink.nframes
 @inline Base.eltype(sink::MP3FileSink) = PCM16Sample
 
 """
@@ -42,37 +46,13 @@ save an MP3 file, using parameters as specified
 * others: ID3v2 tag items to be added
 """
 function save(file::File, buf::SampleBuf;
-              nchannels::Integer = -1,
-              samplerate::Union{Integer, Hertz} = -1,
-              bitrate::Integer = 320,
-              VBR::Bool = false,
-              quality::Number = 4,
-              title::AbstractString = "",
-              artist::AbstractString = "",
-              album::AbstractString = "",
-              year::AbstractString = "",
-              comment::AbstractString = "")
-
-    stream = savestream(file, MP3INFO(buf);
-                        nchannels = nchannels,
-                        samplerate = samplerate,
-                        bitrate = bitrate,
-                        VBR = VBR,
-                        quality = quality,
-                        title = title,
-                        artist = artist,
-                        album = album,
-                        year = year,
-                        comment = comment)
-
-    try
+        samplerate=SampledSignals.samplerate(buf), nchannels=SampledSignals.nchannels(buf),
+        kwargs...)
+    savestream(file; samplerate=samplerate, nchannels=nchannels, kwargs...) do stream
         frameswritten = write(stream, buf)
         if frameswritten != nframes(buf)
             error("Only wrote $frameswritten frames, expected $(nframes(buf))")
         end
-    finally
-        # make sure we close the file even if something goes wrong
-        close(stream)
     end
 
     nothing
@@ -90,62 +70,46 @@ function savestream(f::Function, args...; kwargs...)
     end
 end
 
-function savestream(path::File, info::MP3INFO;
-                    nchannels::Integer = -1,
-                    samplerate::Union{Integer, Hertz} = -1,
-                    bitrate::Integer = 320,
-                    VBR::Bool = false,
-                    quality::Number = 4,
-                    title::AbstractString = "",
-                    artist::AbstractString = "",
-                    album::AbstractString = "",
-                    year::AbstractString = "",
-                    comment::AbstractString = "")
+function savestream(path::File;
+                    nchannels = 2,
+                    samplerate = 44100,
+                    bitrate = 320,
+                    VBR = false,
+                    quality = 4,
+                    title = "",
+                    artist = "",
+                    album = "",
+                    year = "",
+                    comment = "")
 
     lame = lame_init()
-    lame_set_num_samples(lame, info.nframes)
+    # lame_set_num_samples(lame, info.nframes)
 
-
-    # default to the source channels
-    if nchannels < 0
-        nchannels = info.nchannels
-    end
     if nchannels == 1
         lame_set_num_channels(lame, 1)
         lame_set_mode(lame, LAME_MONO)
-        info.nchannels = 1
     elseif nchannels == 2
         lame_set_num_channels(lame, 2)
         lame_set_mode(lame, LAME_JOINT_STEREO)
-        info.nchannels = 2
     else
         error("the output channels should be either mono (1) or stereo (2)")
     end
 
-    # default to the source sample rate
-    if typeof(samplerate) == Hertz
-        samplerate = samplerate.val
-    end
-    if samplerate < 0
-        samplerate = info.samplerate
-    else
-        info.samplerate = samplerate
-    end
     if !(samplerate in [8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000])
         error("sample rate $samplerate Hz is not supported")
     end
     # resampling is handled by SampledSignals
-    lame_set_in_samplerate(lame, samplerate)
-    lame_set_out_samplerate(lame, samplerate)
+    lame_set_in_samplerate(lame, Int(samplerate))
+    lame_set_out_samplerate(lame, Int(samplerate))
 
     if VBR == false
         # CBR mode
-        lame_set_brate(lame, bitrate)
-        lame_set_quality(lame, quality)
+        lame_set_brate(lame, Int(bitrate))
+        lame_set_quality(lame, Int(quality))
     else
         # VBR mode
         lame_set_VBR(lame)
-        lame_set_VBR_quality(lame, quality)
+        lame_set_VBR_quality(lame, Int(quality))
     end
 
     id3tag_init(lame)
@@ -161,13 +125,13 @@ function savestream(path::File, info::MP3INFO;
     lame_init_params(lame)
 
     id3size = lame_get_id3v2_tag(lame, UInt8[], 0)
-    id3buffer = Array(UInt8, id3size)
+    id3buffer = Array{UInt8}(id3size)
     lame_get_id3v2_tag(lame, id3buffer, id3size) == id3size || error("failed to get ID3v2 buffer")
 
     output = open(filename(path), "w")
     write(output, id3buffer)
 
-    MP3FileSink(lame, info, output)
+    MP3FileSink(lame, samplerate, nchannels, output)
 end
 
 function unsafe_write(sink::MP3FileSink, buf::Array, frameoffset, framecount)
@@ -185,23 +149,24 @@ function unsafe_write(sink::MP3FileSink, buf::Array, frameoffset, framecount)
 
     written = 0
     while written < framecount
-        nsamples = min(MP3_BLOCKFRAMES, framecount - written)
+        nframes = min(MP3_BLOCKFRAMES, framecount - written)
         l = left + written * encsize
         r = right + written * encsize
-        bytes = lame_encode_buffer!(lame, l, r, nsamples, mp3buf, MP3_BUFBYTES)
-        Compat.unsafe_write(sink.output, mp3buf, bytes)
+        bytes = lame_encode_buffer!(lame, l, r, nframes, mp3buf, MP3_BUFBYTES)
+        Base.unsafe_write(sink.output, mp3buf, bytes)
 
-        written += nsamples
+        written += nframes
     end
 
+    sink.nframes += written
     written
 end
 
 function Base.close(sink::MP3FileSink)
     if sink.lame != C_NULL
         mp3buf = pointer(sink.mp3buf)
         bytes = lame_encode_flush_nogap(sink.lame, mp3buf, MP3_BUFBYTES)
-        Compat.unsafe_write(sink.output, mp3buf, bytes)
+        Base.unsafe_write(sink.output, mp3buf, bytes)
 
         err = lame_close(sink.lame)
         close(sink.output)