Merge pull request #78 from yurivish/master

Fix some warnings & deprecations on 0.6

Author: JoelHobson

README.md

@@ -75,7 +75,7 @@ for v in values(MIDI.GM) # GM is a map of all the general MIDI instrument names
     push!(notes, E)
     push!(notes, G)
     # This changes the instrument currently used
-    MIDI.programchange(track, G.position + inc + inc, uint8(0), v)
+    MIDI.programchange(track, G.position + inc + inc, UInt8(0), v)
     C.position += inc
     E.position += inc
     G.position += inc

REQUIRE

@@ -1 +1 @@
-julia 0.5
+julia 0.6

src/miditrack.jl

@@ -95,7 +95,7 @@ function writetrack(f::IO, track::MIDITrack)
     # Write the track end event
     writeevent(event_buffer, MetaEvent(0, METATRACKEND, UInt8[]))
 
-    bytes = takebuf_array(event_buffer)
+    bytes = take!(event_buffer)
 
     write(f, hton(UInt32(length(bytes))))
     write(f, bytes)

test/metaevent.jl

@@ -22,7 +22,7 @@
         for (output, input) in validtestvalues
             buf = IOBuffer()
             MIDI.writeevent(buf, input)
-            @test takebuf_array(buf) == output
+            @test take!(buf) == output
         end
     end
 

test/midievent.jl

@@ -17,17 +17,17 @@
 
             result = MIDI.readMIDIevent(Int64(input_no_status[1]), IOBuffer(input_no_status[2:length(input_no_status)]), status)
             @test result.dT == output.dT && result.data == output.data
-        
+
             input, output = output, input
             output_no_status = input_no_status
 
             buf = IOBuffer()
             MIDI.writeevent(buf, input, true)
-            @test takebuf_array(buf) == output
+            @test take!(buf) == output
 
             buf = IOBuffer()
             MIDI.writeevent(buf, input, false)
-            @test takebuf_array(buf) == output_no_status
+            @test take!(buf) == output_no_status
         end
     end
 end

test/miditrack.jl

@@ -29,7 +29,7 @@ invalidtestvalues = [
         for (output, input) in validtestvalues
             buf = IOBuffer()
             MIDI.writetrack(buf, input)
-            @test takebuf_array(buf) == output
+            @test take!(buf) == output
         end
     end
 
@@ -64,9 +64,9 @@ invalidtestvalues = [
     @testset "it should allow notes and program change events to be written to a track" begin
         buf = IOBuffer()
         MIDI.writetrack(buf, track)
-        @test takebuf_array(buf) == [0x4d, 0x54, 0x72, 0x6b, 0x00, 0x00, 0x00, 0x52, 0x60, 0x90, 0x3c, 0x7f, 0x30, 0x43, 0x7f, 0x30, 0x80, 0x3c, 0x7f, 0x00, 0x90, 0x40, 0x7f, 0x30, 0x80, 0x43, 0x7f, 0x30, 0xc0, 0x00, 0x00, 0x80, 0x40, 0x7f, 0x00, 0x90, 0x3c, 0x7f, 0x30, 0x43, 0x7f, 0x30, 0x80, 0x3c, 0x7f, 0x00, 0x90, 0x40, 0x7f, 0x30, 0x80, 0x43, 0x7f, 0x30, 0xc0, 0x01, 0x00, 0x80, 0x40, 0x7f, 0x00, 0x90, 0x3c, 0x7f, 0x30, 0x43, 0x7f, 0x30, 0x80, 0x3c, 0x7f, 0x00, 0x90, 0x40, 0x7f, 0x30, 0x80, 0x43, 0x7f, 0x30, 0xc0, 0x02, 0x00, 0x80, 0x40, 0x7f, 0x00, 0xff, 0x2f, 0x00]
+        @test take!(buf) == [0x4d, 0x54, 0x72, 0x6b, 0x00, 0x00, 0x00, 0x52, 0x60, 0x90, 0x3c, 0x7f, 0x30, 0x43, 0x7f, 0x30, 0x80, 0x3c, 0x7f, 0x00, 0x90, 0x40, 0x7f, 0x30, 0x80, 0x43, 0x7f, 0x30, 0xc0, 0x00, 0x00, 0x80, 0x40, 0x7f, 0x00, 0x90, 0x3c, 0x7f, 0x30, 0x43, 0x7f, 0x30, 0x80, 0x3c, 0x7f, 0x00, 0x90, 0x40, 0x7f, 0x30, 0x80, 0x43, 0x7f, 0x30, 0xc0, 0x01, 0x00, 0x80, 0x40, 0x7f, 0x00, 0x90, 0x3c, 0x7f, 0x30, 0x43, 0x7f, 0x30, 0x80, 0x3c, 0x7f, 0x00, 0x90, 0x40, 0x7f, 0x30, 0x80, 0x43, 0x7f, 0x30, 0xc0, 0x02, 0x00, 0x80, 0x40, 0x7f, 0x00, 0xff, 0x2f, 0x00]
     end
-    
+
     @testset "it should correctly get notes from a track" begin
         sort!(notes, lt=((x, y)->x.position<y.position))
         for (n1, n2) in zip(notes, MIDI.getnotes(track))

test/sysexevent.jl

@@ -24,7 +24,7 @@ end
     for (output, input) in validtestvalues
         buf = IOBuffer()
         MIDI.writeevent(buf, input)
-        @test takebuf_array(buf) == output
+        @test take!(buf) == output
     end
 end
 

test/variablelength.jl

@@ -17,7 +17,7 @@ testvalues = [
         for (output, input) in testvalues
             buf = IOBuffer()
             MIDI.writevariablelength(buf, Int64(input))
-            @test takebuf_array(buf) == output
+            @test take!(buf) == output
         end
     end
 end