fest 1.4.14 → 1.4.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53f68ffbc15a4a6966f6fcb94ce7574d62ca544d
-  data.tar.gz: e84ae4593be638f11355e4176e92940f6a2baeb9
+  metadata.gz: 98f5086be48f06050360fb29ec532b06a1c1fd31
+  data.tar.gz: 9f8fd4846065ece8468613d4649cce61fae8b73f
 SHA512:
-  metadata.gz: b60e425906795bf19eaaafb1247731d783b3f638d13f0a8cdd9d6d696aafd953786068d36ba7a54e91531036e7e14367342291c8c4a290b90e4307d68a53112e
-  data.tar.gz: 0ef24eb74d9d1e5576c35ced977b9862572e4cb3f11128c0841c6019a76d45bc06165a8196449733b100f4bffb86520dc8f05dcbdf6dcb63a8502488809b0df3
+  metadata.gz: 4dad9d66fee894a0815df1dd469283325c0786334b51ba9c9eebe7feff186104cba1cbedc3bef52d3d574c34a7efc3553cce125a3101eb6e99a86c8f407ce0b1
+  data.tar.gz: c373ff857191f69877389c7c28223de381449fb4af3bcde8fc860959250ddc052e0288d2b51fd4130d221b5cb0fd3044b8b655054518dfcbc80f87447136b662

data/changelog.org

@@ -1,3 +1,5 @@
+** 1.4.15 (Чт 15 окт 2015 17:29:36)
+- fix common volume if lower and upper mix, max volume ...
 ** 1.4.14 (Ср 14 окт 2015 13:34:03)
 - fix optimize volume with flat_volumes ...
 ** 1.4.13 (Ср 14 окт 2015 11:59:29)

data/config/default.yml

@@ -9,7 +9,7 @@ index:
   - "index = `ls -r #{@path} | grep -o '[0-9]*' | sed '1 ! d'`.to_i"
   - "index > 0 ? index += 1 : index = 1"
 min_volume:
-  20
+  30
 max_volume:
   60
 step:

data/fest.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name = 'fest'
-  gem.version = '1.4.14'
+  gem.version = '1.4.15'
   gem.authors = 'Alexsey Ermolaev'
   gem.email = 'afay.zangetsu@gmail.com'
   gem.homepage = 'https://github.com/AfsmNGhr/fest'
@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
 
   gem.extra_rdoc_files = ['License.org', 'README.md']
-  gem.requirements = ['*nix* or OS X (pgrep tools)',
+  gem.requirements = ['*nix* or OS X (pgrep, amixer)',
                       'Pulseaudio sound server',
                       'Festival speech engine']
 end

data/lib/fest.rb

@@ -54,9 +54,20 @@ class Fest
     current_volumes_on_inputs
     volumes_for_inputs
     change_volumes(@current_volumes, @volumes, @step)
+    paplay_wav
+    change_volumes(@volumes, @current_volumes, @step)
+  end
+
+  def paplay_wav
+    change_common_volume(optimize_common_volume)
     system("paplay #{@path}/say_#{@index}.wav \
       --volume='#{optimize_volume * 655}' > /dev/null 2>&1")
-    change_volumes(@volumes, @current_volumes, @step)
+    change_common_volume(@common_volume)
+  end
+
+  def change_common_volume(volume)
+    system("amixer set Master '#{volume}%' \
+      > /dev/null 2>&1") if @flat_volumes == 'no'
   end
 
   def delete_wav

data/lib/fest/volume.rb

@@ -18,21 +18,19 @@ module Volume
   def optimize_volume
     case @flat_volumes
     when 'yes'
-      if @common_volume > @max_volume
-        @max_volume
-      elsif @common_volume < @min_volume
-        @min_volume
-      else
-        @common_volume
-      end
+      optimize_common_volume
     else
-      if @common_volume > @max_volume
-        @max_volume
-      elsif @common_volume < @min_volume
-        @min_volume
-      else
-        100
-      end
+      100
+    end
+  end
+
+  def optimize_common_volume
+    if @common_volume > @max_volume
+      @max_volume
+    elsif @common_volume < @min_volume
+      @min_volume
+    else
+      @common_volume
     end
   end
 

data/spec/volume_spec.rb

@@ -52,13 +52,7 @@ RSpec.describe Fest do
           expect(@fest.optimize_volume).to eq(@common_volume)
         end
       else
-        if @common_volume > @max_volume
-          expect(@fest.optimize_volume).to be < @common_volume
-        elsif @common_volume < @min_volume
-          expect(@fest.optimize_volume).to be > @common_volume
-        else
-          expect(@fest.optimize_volume).to eq(100)
-        end
+        expect(@fest.optimize_volume).to eq(100)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fest
 version: !ruby/object:Gem::Version
-  version: 1.4.14
+  version: 1.4.15
 platform: ruby
 authors:
 - Alexsey Ermolaev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- "*nix* or OS X (pgrep tools)"
+- "*nix* or OS X (pgrep, amixer)"
 - Pulseaudio sound server
 - Festival speech engine
 rubyforge_project: