rubySC 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c715abbf1240f534cab6767762f9e89c2b9d50e
-  data.tar.gz: 176efdd566e7bb588b0ad853ce1524c7cc133489
+  metadata.gz: 192ed2fc0c38281ca89da8d6e75d16fba4b447a3
+  data.tar.gz: 670103c666d4b8ddeb84f38e5ad24f2d94e35cbd
 SHA512:
-  metadata.gz: 0c49e497d1af6da7de5669e2b3c0272a856c066070722cc97e098c28041b84752cd3ab3a205a06708db2b09222d151cd40bbe8a3780b601bda634107974891be
-  data.tar.gz: 8fe82bb7e78e2b616255b9ede8e0ff4c88119263dfa78c875dd96d7510b2503407074ea7e5accfd6bfcb18f91d36985c99b72e89ced0eec4330a0537d8f8cf08
+  metadata.gz: f10a28132c701d40ca72d10d8cfe1f3030439b1dcd5d6359d75212360a010627ec5429d2b2a862dc3dc710aa8f678e511b47d96f226e5de3dbf66758e41767fb
+  data.tar.gz: 27a40182ef4c1209ae178069727f693a7528fee78aff20a68c348d094da5d6eba21ced4450df777f91316012ed85b7dae8196476d4a5f815f6227c6bf17cab60

data/README.md

@@ -1,36 +1,3 @@
-<<<<<<< HEAD
-# RubySC
-
-TODO: Write a gem description
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'rubySC'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install rubySC
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Contributing
-
-1. Fork it ( http://github.com/<my-github-username>/rubySC/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-=======
-# rubySC
-
 rubySC est une petite biliothèque qui complète à sa manière
 [SCruby](https://github.com/maca/scruby) en offrant une interface avec
 la bibliothèque JTLib de SuperCollider, cette dernière étant tournée

data/lib/rubySC.rb

@@ -123,24 +123,15 @@ class SC
 
     SC.updateScore
 
-    args.each do |arg|
-    if arg.is_a? Voix
-      @@listeVoix[arg.name]=arg
-      self.updateScore
-      self.send "Pdef(\\#{arg.name}).play"
-    else
-      if arg==nil then
-        tmpargs=@@listeVoix.keys
-        tmpargs.each do |voix|
-            self.send "Pdef(\\#{voix.to_s}).play"
-          end
-      else
-        self.send "Pdef(\\#{arg.to_s}).play"
+    if args[0]==nil then
+      args=@@listeVoix.keys
+      args.each do |voix|
+        self.send "Pdef(\\#{voix.to_s}).play"
       end
     end
-    end
   end
 
+
   def self.stop *args
     if args[0]==nil then
       args=@@listeVoix.keys

data/lib/rubySC/contrepoint.rb

@@ -22,10 +22,12 @@ end
 
 end
 
-def organum voix
+def organum voix, typeHarmonisation=[-2,0,2,4]
 
 a= Voix.new "harmonisationDe"+voix.name
 
-a.degree= harmoniser voix.degree, [2]
+a.degree= harmoniser voix.degree, typeHarmonisation
+a.setDuree voix.dur
 
+SC.updateScore
 end

data/lib/rubySC/melodie.rb

@@ -1,7 +1,7 @@
-def creerMelodie nbNote=rand(4..12)
+def creerMelodie nbNote=rand(10..30)
 
   Array.new (nbNote) do |note|
-    note=[0,0,1,2,3,3,4,4,5,6].sample
+    note=[0,0,1,1,2,3,3,3,3,4,4,4,4,5,6].sample   #manière un peu bourrine de "pondérer" les notes possibles
   end
 end
 
@@ -24,8 +24,8 @@ end
 def creerRythme melodie  #analyse
 
   rythme = intervallesMel melodie
-  rythme.map { |inter|
-    if inter.abs>1
+  rythme.map! { |inter|
+    if inter.abs > 1
       note= 2
     else
       note=1

data/lib/rubySC/version.rb

@@ -1,3 +1,3 @@
 module RubySC
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/lib/rubySC/voix.rb

@@ -25,10 +25,10 @@ class Voix
 
     self.setDuree options["dur"]
 
-    if options["degree"].nil?
+    if options[:degree].nil?
       then @degree=Array.new(rand(1..5)) do |x| x=rand(12) end
     else
-      @degree=options["degree"]
+      @degree=options[:degree]
     end
 
     if options["octave"].nil?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubySC
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - simdax