musicality 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c80e6fa5fd903b82f6a850f9780739197b0a3c56
-  data.tar.gz: a110c580d68007bab242f7d7a647e4b583abd885
+  metadata.gz: f859d6a80c045507491575cffe0f999847d337bf
+  data.tar.gz: 1f342c1ea5e6402c817850d5589d857d4673541b
 SHA512:
-  metadata.gz: bc1b333be0c54a2171344aba9458f5e32c2e4a8c2737431821525f058c6a827bd2eb351261cf2a6d159518c1e3281d79dadc621d6c48dbe58a8cec9adfa383f0
-  data.tar.gz: a8e82d0a11291148498a6c54f17c0cb3db4f3071946946e0668cf7e5a335a6d8f3e782bf1137f49304e20efdd78b4441697fc980f6f229d73570122e4ecd6e54
+  metadata.gz: 741b7b48887b0015cc58816c5c689e9b3c214a7030ad83e83fbc7948349b1aed60bd606e09cf1de89d545496abfd520f4ccfd7664c767cb29f38c1110b1d6b45
+  data.tar.gz: 8bc2b08df2b6b1d574efe17185463f174c09aef58f3341455ba697a747b4d7ff4538d367cdcd6de0a9f8fb16646fb6ec7d2a3556a17aa01ccc6eb1d264b3083b

data/ChangeLog.md

@@ -1,3 +1,14 @@
+### 0.11.0 / 2016-02-18
+* Fix SuperCollider volume control to output stereo
+* Add :keep_code keyword arg to SuperCollider::Conductor#perform
+* Add convenience method Part#dynamic_change for adding a new dynamic change
+* Add Project::update method and 'musicality update' subcommand
+* Allow 'musicality new' to be ran on a non-empty directory. Existing scores directories will ignored, and existing project directories will be updated
+* Add auditions executable. Add auditions rake tasks: auditions, auditions:wav, etc.
+* Fix bug in Score#collated?
+* Support interactive auditions using VLC on Linux
+* Change Score::Tempo#initialize to only require the start tempo, making start meter an optional keyword argument
+
 ### 0.10.1 / 2016-01-08
 * Kill sclang process with Process.kill(9,pid) when running on Windows. Otherwise use Process.kill('INT',pid)
 * Delete .scd after it is processed
@@ -29,7 +40,7 @@
 * Add Part#settings. Create settings classes for LilyPond and MIDI
 * Add Part#lilypond_settings in lilypond_settings.rb and Part#midi_settings in midi_settings.rb
 * Add support for non-realtime SUperCollider performance
-* Make dynamic levels increase exponentially, like 
+* Make dynamic levels increase exponentially, like
 * In ScoreCollator#collate_changes, return new start value as well as dynamic changes, instead of always creating an initial immediate change
 * Add SynthDef class to be able to include SynthDefs in SuperCollider code
 * Add musicality project infrastructure
@@ -65,7 +76,7 @@
 * Conversion of both tempo-based scores (measured and unmeasured) directly to time-based score
 * Trimming of gradual changes, useful in collating scores
 * Refactoring of ValueComputer using Function and Transition utility classes
-* Add optional start_value for gradual changes, for making them absolute (by default they're relative) 
+* Add optional start_value for gradual changes, for making them absolute (by default they're relative)
 * Add 'with' kw arg to change pack/unpack methods, for converting start/end values
 
 ### 0.2.0 / 2014-11-24
@@ -90,4 +101,3 @@
 * Packing/unpacking to/from hash, using stringizing/parsing to condense, esp. for notes
 * Convert score to MIDI file via midilib gem
 * bin/midify command-line utility to run MIDI conversion on score YAML file
-

data/README.md

@@ -74,25 +74,25 @@ include Meters
 include Dynamics
 include Pitches
 
-score = Score::Tempo.new(FOUR_FOUR, 120, title: "Twinkle, Twinkle, Little Star") do |s|
+score = Score::Tempo.new(120, title: "Twinkle, Twinkle, Little Star") do |s|
   s.parts["rhand"] = Part.new(MF) do |p|
     a_notes = q(C4,C4,G4,G4,A4,A4) + h(G4) +
               q(F4,F4,E4,E4,D4,D4) + h(C4)
     b_notes = q(G4,G4,F4,F4,E4,E4) + h(D4)
     p.notes += a_notes + b_notes
   end
-  
+
   s.parts["lhand"] = Part.new(MF) do |p|
     Cmaj = [C3,E3,G3]
     Fmaj = [F2,A2,C3]
     Gmaj = [G2,B2,D3]
-    
-    a_chords = h(Cmaj,Cmaj,Fmaj,Cmaj) + 
+
+    a_chords = h(Cmaj,Cmaj,Fmaj,Cmaj) +
                h(Fmaj,Cmaj,Gmaj,Cmaj)
     b_chords = h(Cmaj,Fmaj,Cmaj,Gmaj)
     p.notes += a_chords + b_chords
   end
-  
+
   s.program.push 0...4
   s.program.push 4...6
   s.program.push 4...6
@@ -131,7 +131,7 @@ The score DSL is an internal DSL (built on Ruby) that consists of a *score* bloc
 
 Here is an example of a score file.
 ```ruby
-tempo_score Meters::FOUR_FOUR, 120 do
+tempo_score 120 do
   title "Twinkle, Twinkle, Little Star"
 
   Cmaj = [C3,E3,G3]
@@ -141,7 +141,7 @@ tempo_score Meters::FOUR_FOUR, 120 do
     notes(
       "rhand" => q(C4,C4,G4,G4,A4,A4) + h(G4) +
                  q(F4,F4,E4,E4,D4,D4) + h(C4),
-      "lhand" => h(Cmaj,Cmaj,Fmaj,Cmaj) + 
+      "lhand" => h(Cmaj,Cmaj,Fmaj,Cmaj) +
                  h(Fmaj,Cmaj,Gmaj,Cmaj)
     )
   end
@@ -166,7 +166,7 @@ include Pitches
 
 dsl = ScoreDSL.load 'twinkle.score'
 score = dsl.score
-``` 
+```
 
 
 ## Musicality Projects

data/bin/auditions

@@ -0,0 +1,241 @@
+#!/usr/bin/env ruby
+
+exe_name = File.basename(__FILE__)
+
+doc = <<DOCOPT
+Creates audition audio files from the given score's auditions.
+
+In the default (non-interactive) mode, the audition output files are simply
+created and then left for the user to play and delete on their own.
+
+In the interactive audition mode, audition files will be played under control of
+the user. Each audition file will have a status associated with it, and will be
+one of:
+  - undecided
+  - rejected
+  - accepted
+
+Playback will continue as long as there are still undecided auditions.
+Once an audition is marked accepted/rejected it will be removed from the
+playlist. When the audition ends, the final status of each audition will be
+displayed. The user will then have the option of deleting the rejected
+audition files.
+
+During the interactive audition mode, the user can enter one of the following
+commands at any time:
+  - accept: Accept the current audition and start playing the next audition
+            under consideration.
+  - reject: Reject the current audition and start playing the next audition
+            under consideration.
+  - prev:   Play the previous audition that is still under consideration.
+  - next:   Skip to the next audition that is still under consideration.
+  - quit:   Stop the audition.
+
+Usage:
+  #{exe_name} SCORE_FILE [options]
+
+Arguments:
+  SCORE_FILE     Score YAML file (packed as a Hash or not)
+
+Options:
+  -i --interactive  Enable interactive mode
+  --outdir=OUTD     Dir where files will be put (defaults to same dir as
+                    audition file). Will be created if needed.
+  --format=FORMAT   Audio file format to output. Valid formats are FLAC, WAV, and AIFF [default: FLAC]
+  -h --help         Show this screen.
+  --version         Show version.
+DOCOPT
+
+require 'docopt'
+begin
+  args = Docopt::docopt(doc)
+  puts args
+rescue Docopt::Exit => e
+  puts e.message
+  exit
+end
+
+require 'musicality'
+
+if args["--version"]
+  puts "#{exe_name} from musicality v#{Musicality::VERSION}"
+  exit
+end
+
+SCORE_FILE = args["SCORE_FILE"]
+unless File.exists? SCORE_FILE
+  puts "Score file #{SCORE_FILE} does not exist. Aborting."
+  exit
+end
+
+require 'fileutils'
+
+if args["--outdir"]
+  OUTDIR = args["--outdir"]
+  unless Dir.exists? OUTDIR
+    puts "Output directory #{OUTDIR} does not exist. Creating."
+    FileUtils.mkdir_p OUTDIR
+    unless Dir.exists? OUTDIR
+      puts "Output directory #{OUTDIR} could not be created. Aborting."
+      exit
+    end
+  end
+else
+  OUTDIR = File.dirname(SCORE_FILE)
+end
+
+INTERACTIVE = args["--interactive"]
+AUDIO_FORMAT = args["--format"].downcase
+TEMPO_SAMPLE_RATE = 200
+ALLOWED_FNAME_SYMBOLS = /[A-Za-z0-9_]/
+
+unless ["flac","wav","aiff"].include?(AUDIO_FORMAT)
+  puts "Unsupported audio format #{AUDIO_FORMAT}. Aborting."
+  exit
+end
+
+require 'yaml'
+include Musicality
+
+print "Reading file '#{SCORE_FILE}'..."
+score = YAML.load(File.read(SCORE_FILE))
+
+if score.is_a? Hash
+  score = score.unpack
+end
+puts "done"
+
+require 'open3'
+
+score.auditions.each do |audition|
+  puts "Beginning audition for part '#{audition.part_name}'"
+
+  unless score.parts.has_key? audition.part_name
+    puts "Score does not have part #{audition.part_name} for audition. Aborting."
+    exit
+  end
+
+  score.program = audition.program
+  unless score.is_a? Score::Timed
+    print "Converting to timed score..."
+    score = score.to_timed(TEMPO_SAMPLE_RATE)
+    puts "done"
+  end
+
+  unless score.valid?
+    puts "Score is not valid. See errors:"
+    puts score.errors.join("\n")
+    exit
+  end
+
+  base_fpath = "#{OUTDIR}/#{audition.part_name}_"
+
+  output_files = []
+  audition.performers.each do |name, sc_settings|
+    if /[\W]/ =~ name
+      puts "Replacing Non-word characters found in #{name} with underscores."
+      name = name.gsub(/[\W]/,"_")
+    end
+
+    score.parts[audition.part_name].settings = [ sc_settings ]
+    conductor = SuperCollider::Conductor.new(score)
+
+    base_fpath2 = base_fpath + name
+    conductor.perform(base_fpath2, selected_parts: [audition.part_name])
+
+    input_fpath = base_fpath2 + ".osc"
+    output_fpath = base_fpath2 + "." + AUDIO_FORMAT
+
+    print "Rendering #{output_fpath}..."
+    `scsynth -N #{input_fpath} _ #{output_fpath} 44100 #{AUDIO_FORMAT} int16`
+    puts "done"
+
+    File.delete(input_fpath)
+    output_files.push output_fpath
+  end
+
+  if INTERACTIVE
+    def kill_pid pid
+      if OS.windows?
+        Process.kill 9, pid
+      else
+        Process.kill "INT", pid
+      end
+    end
+
+    undecided = output_files
+    rejected = []
+    accepted = []
+
+    user_input = ""
+    i = 0
+
+    user_input_thread = Thread.new do
+      while true
+        user_input = STDIN.gets.chomp
+        #STDOUT.puts "got user input \"#{user_input}\""
+      end
+    end
+
+    # launch VLC with the 'remote control' console interface
+    Open3.popen2("vlc --intf rc #{undecided.join(" ")}") do |stdin, stdout, wait_thread|
+      pid = wait_thread.pid
+
+      vlc_running = true
+      while vlc_running
+        case user_input
+        when "next", "prev"
+          stdin.puts user_input
+        when "accept","reject"
+          begin
+            stdout.read_nonblock(2**16)
+          rescue IO::WaitReadable
+          end
+          stdin.puts "status"
+
+          result = stdout.readline
+          i = undecided.find_index {|fstr| result.include? fstr }
+          raise "Could not find file from status output #{result}" if i.nil?
+
+          if user_input == "accept"
+            accepted.push undecided.delete_at(i)
+          else
+            rejected.push undecided.delete_at(i)
+          end
+          stdin.puts "next"
+        when "quit"
+          vlc_running = false
+          stdin.puts "quit"
+        end
+        user_input = ""
+
+        if undecided.empty?
+          vlc_running = false
+          stdin.puts "quit"
+        end
+      end
+    end
+
+    user_input_thread.kill
+
+    if undecided.any?
+      puts "Undecided:"
+      undecided.each { |f| puts "  " + f }
+      puts
+    end
+
+    if rejected.any?
+      puts "Rejected:"
+      rejected.each { |f| puts "  " + f }
+      puts
+    end
+
+    if accepted.any?
+      puts "Accepted:"
+      accepted.each { |f| puts "  " + f }
+      puts
+    end
+
+    # TODO ask the user if they would like to delete the rejected auditions
+  end
+end

data/bin/collidify

@@ -25,6 +25,7 @@ Options:
   --srate=SRATE  Sampling rate for converting tempo-based score to time-based
                  score, and for sampling dynamic change values [default: 200]
   --leadtime=LT  Time before performance begins (must be > 0) [default: 0.1]
+  --keepcode     Do not delete the intermediate SuperCollider code file (.scd)
   -h --help      Show this screen.
   --version      Show version.
 DOCOPT
@@ -63,7 +64,8 @@ end
 
 VERBOSE = args["--verbose"]
 PARTS = args["PART"]
-LEADTIME = args["--leadtime"].to_f
+LEAD_TIME = args["--leadtime"].to_f
+KEEP_CODE = args["--keepcode"]
 
 require 'yaml'
 include Musicality
@@ -86,7 +88,7 @@ File.open(SCORE_FILE) do |fin|
   if score.valid?
     conductor = SuperCollider::Conductor.new(score)
 
-    perform_kwargs = { :verbose => VERBOSE, :lead_time => LEADTIME }
+    perform_kwargs = { :verbose => VERBOSE, :lead_time => LEAD_TIME, :keep_code => KEEP_CODE }
     if PARTS.any?
       perform_kwargs[:selected_parts] = PARTS
     end

data/bin/musicality

@@ -3,15 +3,23 @@
 exe_name = File.basename(__FILE__)
 
 doc = <<DOCOPT
-The 'new' subcommand wll create a new musicality project.
+The 'new' subcommand wll create a new musicality project in the given directory.
+If the given directory does not exist then it will be created. If it exists
+then any existing project files will be updated as under the update subcommand.
+
+The 'update' subcommand will update/restore the project files (Gemfile,
+Rakefile, and config.yml) while preserving any modifications. Unless a
+directory is specified, the current working directory is assumed to be the
+project directory.
 
 Usage:
   #{exe_name} new PROJECT_DIR [options]
+  #{exe_name} update [PROJECT_DIR] [options]
   #{exe_name} -h | --help
   #{exe_name} --version
 
 Arguments:
-  PROJECT_DIR Path of an empty directory or directory to be created
+  PROJECT_DIR project root directory
 
 Options:
   -h --help     Show this screen.
@@ -36,4 +44,7 @@ end
 
 if args["new"]
   Musicality::Project.new(args["PROJECT_DIR"])
+elsif args["update"]
+  project_dir = args["PROJECT_DIR"] || Dir.pwd
+  Musicality::Project.update(project_dir)
 end

data/examples/composition/auto_counterpoint.rb

@@ -13,13 +13,13 @@ def random_melody rhythm, pitch_palette
   pitch_sampler = RandomSampler.new(pitches,Probabilities.random(pitches.size))
   make_notes(rhythm, pitch_sampler.sample(rhythm.size))
 end
-  
+
 def random_counterpoint rhythm, rhythm_palette, sample_rate, pitch_palette
   cpg = CounterpointGenerator.new(rhythm,rhythm_palette)
   counterpoint = cpg.best_solutions(25,0.5,sample_rate).sample
   pitches = pitch_palette.sample(rand(2..pitch_palette.size))
   pitch_sampler = RandomSampler.new(pitches,Probabilities.random(pitches.size))
-  make_notes(counterpoint, pitch_sampler.sample(counterpoint.size))  
+  make_notes(counterpoint, pitch_sampler.sample(counterpoint.size))
 end
 
 2.times do
@@ -43,10 +43,10 @@ end
   end
 end
 
-score = Score::Tempo.new(Meters::FOUR_FOUR, 120,
+score = Score::Tempo.new(120,
   parts: { "bass" => bass, "guitar" => guitar },
   program: [ 0...([bass.duration,guitar.duration].min) ]
 )
 
 seq = ScoreSequencer.new(score.to_timed(200)).make_midi_seq
-File.open("./auto_counterpoint.mid", 'wb'){ |fout| seq.write(fout) }
+File.open("./auto_counterpoint.mid", 'wb'){ |fout| seq.write(fout) }

data/examples/composition/part_generator.rb

@@ -11,12 +11,12 @@ major = Heptatonic::Prima::MAJOR
 pitch_seqs = {
   D4 => minor, C4 => major, E4 => minor, F4 => minor
 }.map do |pitch,scale_class|
-  scale_class.to_pitch_seq(pitch)        
+  scale_class.to_pitch_seq(pitch)
 end
 
 rhythm_seq2 = RepeatingSequence.new([3/8.to_r]*4)
 
-score = Score::Tempo.new(SIX_EIGHT,90) do |s|
+score = Score::Tempo.new(90, start_meter: SIX_EIGHT) do |s|
   s.parts["main"] = Part.new(Dynamics::MF) do |p|
     p.settings.push MidiSettings::LEAD_SAWTOOTH
 
@@ -27,7 +27,7 @@ score = Score::Tempo.new(SIX_EIGHT,90) do |s|
     pitches = pitch_seqs.map { |pseq| pseq.at(poffsets).to_a }.flatten
     p.notes += make_notes(rhythm,pitches)
   end
-  
+
   s.parts["bass"] = Part.new(Dynamics::MP) do |p|
     p.settings.push MidiSettings::LEAD_SQUARE
 
@@ -38,7 +38,7 @@ score = Score::Tempo.new(SIX_EIGHT,90) do |s|
     pitches = pitch_seqs.map { |pseq| pseq.at(poffsets).to_a }.flatten
     p.notes += make_notes(rhythm,pitches)
   end
-  
+
   s.parts["pluck"] = Part.new(Dynamics::MP) do |p|
     p.settings.push MidiSettings::ORCHESTRAL_HARP
 
@@ -49,9 +49,9 @@ score = Score::Tempo.new(SIX_EIGHT,90) do |s|
     pitches = pitch_seqs.map { |pseq| pseq.at(poffsets).to_a }.flatten
     p.notes += make_notes(rhythm,pitches)
   end
-  
+
   s.program = [0...s.measures_long]*2
 end
 
 seq = ScoreSequencer.new(score.to_timed(200)).make_midi_seq
-File.open("./part_generator.mid", 'wb'){ |fout| seq.write(fout) }
+File.open("./part_generator.mid", 'wb'){ |fout| seq.write(fout) }