fest 1.1.8 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3591c2d8c0d78cdee63ae0a17e90db5881cee182
-  data.tar.gz: 72282204464bcaaebe830b112d2cba81799d0069
+  metadata.gz: ba584e53442bb9a6b6f1a43353515967addac429
+  data.tar.gz: 0a0d3aee5a55a0b10d2159b051eb4a004624fcb0
 SHA512:
-  metadata.gz: ebf0367769a62ae9dd777deab0306fe32e967842409191177f07bc95375e9e73dedc1234940ba793fcac33aecc6c457212974484076050e80d6c69d15fb4055a
-  data.tar.gz: 240b3f45b4ce59728f86fe0f173858a977b128325454e9e02d437d4c44d5c22a2727eb6dc1617164b7010beca0204377f7c52166ab3857d59f5e3a63e35d0439
+  metadata.gz: 58ef139749434ba3180419bd2b7da564c3170f64b4e215e4f2e10eedbd1c94082d15635832cefc77e73344ff00c81066a638905d798aced881e7739bb59e03f0
+  data.tar.gz: eacb851763c3aad4fc76e5f301ddb0d54efbac2df2dedc54b97503bc4ae124aec0550a23c11b69ed5f5fea987e18f5e6049efc1c855b52c0da410d058c0758df

data/README.org

@@ -83,16 +83,15 @@ puts text
 
 @fest.turn_down_volume
 # Получает список входящих каналов @inputs
-# Понижает громкость на @down_volume ...
-# @down_volume = @current_volume / 10 * 4
-# @down_volume = @current_volume / 10 * @params[:down_volume[2]]
+# Понижает громкость ... c шагом...
+# @volume = @current_volume - @current_volume / 10 * @step
 
 @fest.play_wav
 # выполняет turn_down_volume
 # Проигрывает wav ... c @optimize_volume
 
 @fest.return_current_volume
-# Возращает громкость на каналах @inputs ...
+# Возращает громкость на каналах @inputs с шагом...
 
 @fest.delete_wav
 # Удаляет проигранный файл ...

data/changelog.org

@@ -1,3 +1,6 @@
+** 1.1.9 (2015-01-30 Пт)
+- Понижение громкости и возрат с шагом @step
+- Добавлена проверка на kodi ...
 ** 1.1.8 (2015-01-13 Вт)
 - удалён change_volume из play_wav
 ** 1.1.7 (2015-01-10 Сб)

data/fest.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "fest"
-  s.version = "1.1.8"
+  s.version = "1.1.9"
   s.authors = ["Alexsey Ermolaev"]
   s.email = %q{afay.zangetsu@gmail.com}
   s.homepage = %q{https://github.com/AfsmNGhr/fest}

data/lib/fest.rb

@@ -20,16 +20,11 @@ class Fest
     @index = `ls -r #{@path} | grep -o '[0-9]*' | sed "1 ! d"`.to_i
     @min_volume = @params[:down_volume[0]] || 20
     @max_volume = @params[:down_volume[1]] || 60
+    @step = @params[:down_volume[2]] || 4
   end
 
   def check_optimal_volume
-    if @params[:down_volume].nil?
-      @down_volume = @current_volume / 10 * 4
-      @volume = @current_volume - @down_volume
-    else
-      @down_volume = @current_volume / 10 * @params[:down_volume[2]]
-      @volume = @current_volume - @down_volume
-    end
+    @volume = @current_volume - @current_volume / 10 * @step
     optimize_min_and_max_volume
   end
 
@@ -57,7 +52,8 @@ class Fest
   def check_home_theater
     xbmc = `ps -el | grep xbmc | wc -l`.to_i
     vlc = `ps -el | grep vlc | wc -l`.to_i
-    exit if xbmc > 0 || vlc > 0
+    kodi = `ps -el | grep kodi | wc -l`.to_i
+    exit if xbmc > 0 || vlc > 0 || kodi > 0
   end
 
   def check_say_wav
@@ -84,7 +80,12 @@ class Fest
   def turn_down_volume
     @inputs = `pactl list sink-inputs | grep № | grep -o '[0-9]*'`.split("\n")
     @inputs.each do |input|
-      system("pactl set-sink-input-volume #{input} '#{@volume * 655}'")
+      volume = @current_volume
+      loop do
+        system("pactl set-sink-input-volume #{input} '#{volume * 655}'")
+        volume -= @step
+        break if volume < @volume
+      end
     end
   end
 
@@ -96,7 +97,12 @@ class Fest
 
   def return_current_volume
     @inputs.each do |input|
-      system("pactl set-sink-input-volume #{input} '#{@current_volume * 655}'")
+      volume = @volume
+      loop do
+        system("pactl set-sink-input-volume #{input} '#{volume * 655}'")
+        volume += @step
+        break if volume > @current_volume
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fest
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.9
 platform: ruby
 authors:
 - Alexsey Ermolaev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies: []
 description: Ruby wrapper for festival scripts
 email: afay.zangetsu@gmail.com
@@ -47,9 +47,8 @@ requirements:
 - Festival speech engine
 - xbacklight
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for festival speech engine
 test_files: []
-has_rdoc: