Merge lp:~pete-woods/hud/voice-bug-1177226 into lp:hud/13.10

[Pete Woods]

Fix voice on the device

Have to duplicate the call to cmd_ln_init to handle each case, it won't accept NULL arguments.

Fix voice on the device

Have to duplicate the call to cmd_ln_init to handle each case, it won't accept NULL arguments.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:253
http://jenkins.qa.ubuntu.com/job/hud-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-raring-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-raring-i386-ci/6

Click here to trigger a rebuild:
http://s-jenkins:8080/job/hud-ci/17/rebuild

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Works

review: Approve

=== modified file 'src/hudsphinx.c'
--- src/hudsphinx.c	2013-03-13 17:31:24 +0000
+++ src/hudsphinx.c	2013-05-07 15:01:49 +0000
@@ -122,11 +122,18 @@
   gchar *hmm = "/usr/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k";
   gchar *dict = "/usr/share/pocketsphinx/model/lm/en_US/cmu07a.dic";
 
-  self->config = cmd_ln_init(NULL, sphinx_cmd_ln, TRUE,
-                                     "-hmm", hmm,
-                                     "-dict", dict,
-                                     "-adcdev", device == NULL ? "" : device,
-                                     NULL);
+  if (device != NULL) { 
+    self->config = cmd_ln_init(NULL, sphinx_cmd_ln, TRUE,
+                                     "-hmm", hmm,
+                                     "-dict", dict,
+                                     "-adcdev", device,
+                                     NULL);
+  } else {
+    self->config = cmd_ln_init(NULL, sphinx_cmd_ln, TRUE,
+                                     "-hmm", hmm,
+                                     "-dict", dict,
+                                     NULL);
+  }
 
   if (self->config == NULL) {
     g_warning("Sphinx command line arguments failed to initialize");