win32-loquendo 1.1.2-x86-mingw32 → 1.2.0-x86-mingw32

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWViNGMxNWQ5MzQyMzg5MDM5Y2JkYmQzMzBkMmYzYzIyYzI0NmRhNw==
+    ZDk1MDQ3MTJjMDMzNmZkMTZiOWM4M2M5YWFjZGM0YTQxZDIxZjk3NQ==
   data.tar.gz: !binary |-
-    NDEyMjhhNTU5OWIxMmE2Yzc0MWI2YzY3ODcxNTk5ZDQ2MGZmOTNiYQ==
+    MmI0YjE1MjU0ZmFmYzk3ODkyNWNjOWI3YmZhMjFiMzQwOTIyNmU3OQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YWJkMTgyOThhMjJkNjhmMGYzNjM4Y2U0NDhhMmI1ODU1YjJhY2Y2YzQyMzVk
-    NmIyZjJlNDY0MTU0OWI0ZWIzYjg4M2Y4ZGQ4NGU5NDY3MDI3MGUyYmNlZGQw
-    ZDdjZWJjNjk0OWYwZTZjYmMyYzc1ZmViYzgwMzFlZThiMjVhZGM=
+    ZTNmNWRjNDg5YTliODc0MDY3OTg2NTg1NDc5NGVhMmQ0NTgzMTM0MzE0NGNl
+    N2RkMmFlMzM5NzNiZWEyMzI3NTQ5ODJjOTEwYmUyNmI3OTc4ZDA3MzUxZWI2
+    OGRkNzczYzQ4YWY2NjQ5NzlmNTdkM2Y0MDA5YzNlZDYxMDExOTI=
   data.tar.gz: !binary |-
-    YTA0OTA1N2ZjMjNlNjIzOWQ2YmY1YThiYzUyNGQyYzEwZmQzZWQ4OGUyMzlj
-    NjgwYmFhNjkyMmJlNGIxZThhMzRkOGI5YjQzZGViYmMyNWQzMjUwNTIyNjM0
-    ZGZmNjRkNmU0ZWE5MTdiZDBiMjhmMmU1NmIzN2JlYzZiZWJhNWU=
+    NDZkMDUwZGU5YjY4ZDk0YjQzYWNhMTM3ZGMzYzZiNGRhNDZhNTcxZDNiMDUz
+    MjE0OTllYzA4NGZkODc4MDNmNjk0YmNlMmVjN2E2OGE2NWVjMjcyMGJmNmUz
+    YmExZTkzODJkNTI0YzY4YWY0OTk5ZDgwOTI1NDNhNjk5ZjYzYzg=

data/README.md

@@ -84,7 +84,8 @@ The command line program is named `say`
 
     Usage: say [OPTIONS] [TEXT]
     
-    TEXT is the text you want to be spoken
+    TEXT is the text you want to be spoken.
+    If no text is provided as arguments, text will be fetched from STDIN instead.
     
     Options:
       -c (1|2)  audio channels to use

data/bin/say

@@ -11,19 +11,22 @@ def usage
        "  -h        show this help text",
        "  -l        lists the available voices",
        "  -s N      sample rate in Hz",
-       "  -v voice  is the voice to use for speaking (default: #{Win32::Loquendo::Reader.default_voice})"
+       "  -v voice  is the voice to use for speaking (default: #{Win32::Loquendo::Reader.default_voice})",
+       "  -V        verbose, displays the voice used"
   exit(1)
 end
 
 def parse_opts
-  h = {:text=>[], :cmd=>:speak, :channels=>2, :sample_rate=>32000, :file=>nil}
+  h = {:text=>[], :cmd=>:speak, :channels=>2, :sample_rate=>32000, :file=>nil, :voice=>Win32::Loquendo::Reader.default_voice}
   while arg = ARGV.shift
     case arg
     when /^-(h|\?)/i then usage
     when '-l' then h[:cmd]         = :list
     when '-c' then h[:channels]    = ARGV.shift.to_i
     when '-s' then h[:sample_rate] = ARGV.shift.to_i
+    when '-f' then h[:file]        = ARGV.shift
     when '-v' then h[:voice]       = ARGV.shift
+    when '-V' then h[:verbose]     = true
     else
       h[:text] << arg
     end
@@ -32,15 +35,27 @@ def parse_opts
   h
 end
 
+def error(msg)
+  puts msg
+  exit(1)
+end
+
 opts = parse_opts
 opts[:text] = STDIN if opts[:text].empty?
 
 trap(:INT){ exit(1) }
 
+if opts[:voice]
+  v = Win32::Loquendo::Reader.voices.find{|s| s.downcase.index(opts[:voice].downcase) }
+  error "No such voice: #{opts[:voice]}" unless v
+  opts[:voice] = v
+end
+
 reader = Win32::Loquendo::Reader.new(opts)
 if opts[:cmd] == :list
   puts reader.voices.join(", ")
 else
+  puts "Using voice: #{v}" if opts[:verbose]
   if opts[:file]
     reader.write(opts[:file], opts[:text])
   else

data/lib/win32/loquendo.rb

@@ -101,6 +101,10 @@ module Win32
       # @return [Array<String>] a list of the installed voices, that can be
       #                         used for speaking.
       def voices
+        self.class.voices
+      end
+
+      def self.voices
         buff = FFI::MemoryPointer.new(:string, 1024)
         unless LoqTTS7.ttsQuery(nil, 1, "Id", nil, buff, buff.size, false, false) == 0
           raise LoquendoException, "Failed to query voices"

data/lib/win32/loquendo/version.rb

@@ -1,5 +1,5 @@
 module Win32
   module Loquendo
-    VERSION = "1.1.2"
+    VERSION = "1.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: win32-loquendo
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: x86-mingw32
 authors:
 - Jonas Tingeborn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2013-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi