X-Git-Url: https://defiant.homedns.org/gitweb/?p=ros_wild_thumper.git;a=blobdiff_plain;f=scripts%2Fpocketsphinx.rb;h=d8e7bef5109edf17db13f5061d0276050c5bdad2;hp=c2a87fbb09601557126e6fc52696c130c15d7a2a;hb=9fc6420d4ecd7763ab37a262d15d0fed2f946e58;hpb=fcd5dd64d2a7538ff45c41ad3c08c627a59598b9

diff --git a/scripts/pocketsphinx.rb b/scripts/pocketsphinx.rb
index c2a87fb..d8e7bef 100755
--- a/scripts/pocketsphinx.rb
+++ b/scripts/pocketsphinx.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby -w
+#!/usr/bin/ruby
 
 require 'gst'
 require 'pry'
@@ -40,8 +40,10 @@ class Speak
 				binding.pry # open console
 				loop.quit
 			when Gst::MessageType::ELEMENT
-				if message.src.name == "asr_kws" and message.structure.get_value(:final).value
-					keyword_detect(message.structure.get_value(:hypothesis).value, message.structure.get_value(:confidence).value)
+				if message.src.name == "asr_kws"
+					if message.structure.get_value(:final).value
+						keyword_detect(message.structure.get_value(:hypothesis).value, message.structure.get_value(:confidence).value)
+					end
 				elsif message.src.name == "asr_jsgf"
 					if message.structure.get_value(:final).value
 						final_result(message.structure.get_value(:hypothesis).value, message.structure.get_value(:confidence).value)
@@ -60,13 +62,13 @@ class Speak
 		@pipeline.play
 	end
 
-	# Enables/Disables the jsgf pipeline
+	# Enables/Disables the jsgf pipeline branch
 	def enable_jsgf(bEnable)
 		valve = @pipeline.get_by_name('valve_jsgf')
 		valve.set_property("drop", !bEnable)
 	end
 
-	# Result of jsgf pipeline
+	# Result of jsgf pipeline branch
 	def final_result(hyp, confidence)
 		@logger.info "final: " + hyp + " " + confidence.to_s
 		enable_jsgf(false)
@@ -88,7 +90,7 @@ class Speak
 end
 
 if __FILE__ == $0
-	node = ROS::Node.new('wild_thumper/pocketsphinx')
+	node = ROS::Node.new('pocketsphinx')
 	app = Speak.new(node)
 	loop = GLib::MainLoop.new(nil, false)
 	begin