Auto stash before merge of "master" and "origin/master"

JuliaMusic · Nov 12, 2019 · dafe426 · dafe426 · Datseris · Nov 12, 2019
1 parent ab0078b
commit dafe426
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,18 +1,21 @@
 name = "MusicVisualizations"
 uuid = "8e838768-4b4f-4130-9d6d-43f7b35ca0d6"
 repo = "https://github.com/JuliaMusic/MusicVisualizations.jl.git"
-version = "0.1.0"
+version = "0.2.0"
 
 [deps]
 DefaultApplication = "3f0dd361-4fe0-5fc6-8523-80b14ec94d85"
 MusicManipulations = "274955c0-c284-5bf7-b122-5ecd51c559de"
 PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 
 [compat]
 julia = "1.1"
 MusicManipulations = "1.0"
 DefaultApplication = "0.1"
 PyPlot = "2.8.1"
+Reexport = "0.2, 0.3, 1.0"
 
 
 [extras]

diff --git a/src/MusicVisualizations.jl b/src/MusicVisualizations.jl
@@ -1,6 +1,8 @@
 module MusicVisualizations
 
-using MusicManipulations, PyPlot, DefaultApplication
+using PyPlot, DefaultApplication
+using Reexport
+@reexport using MusicManipulations
 
 include("musescore.jl")
 include("noteplotter.jl")

diff --git a/src/musescore.jl b/src/musescore.jl
@@ -1,4 +1,4 @@
-export musescore
+export musescore, musescore_drumkey
 
 using MusicManipulations, DefaultApplication
 
@@ -61,15 +61,15 @@ end
 
 
 """
-	MuseScore.drumkey
+	musescore_drumkey
 
 A dictionary that given the drum instrument as a string it returns the
 MIDI pitch that MuseScore uses.
 
 Notice that to import a MIDI file into MuseScore and the drumset to be the selected
 instrument, you should write the MIDI notes to channel `9`.
 """
-const drumkey = begin
+const musescore_drumkey = begin
 	a =
 	Dict(
 	"Acoustic Bass Drum" => "B1",

diff --git a/src/noteplotter.jl b/src/noteplotter.jl
@@ -1,3 +1,4 @@
+using PyPlot
 export noteplotter
 maxnotevel(::Note) = 127
 maxnotevel(::MoreVelNote) = 157