[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [simon] simonlib/simonrecognizer: Looks like SPHINX_0_8 was defined nowhere so let's remove them.
From:       Mario Fux <kde-ml () unormal ! org>
Date:       2015-10-13 15:48:13
Message-ID: E1Zm1oD-0007S8-6f () scm ! kde ! org
[Download RAW message or body]

Git commit c36f220bae6bbf77b7bd30adb96361bc41271955 by Mario Fux.
Committed on 13/10/2015 at 15:44.
Pushed by fux into branch 'master'.

Looks like SPHINX_0_8 was defined nowhere so let's remove them.

And thus this is my first commit to Simon as the new maintainer.
Thanks Peter Grasch for your great work!

M  +1    -10   simonlib/simonrecognizer/sphinxrecognizer.cpp

http://commits.kde.org/simon/c36f220bae6bbf77b7bd30adb96361bc41271955

diff --git a/simonlib/simonrecognizer/sphinxrecognizer.cpp \
b/simonlib/simonrecognizer/sphinxrecognizer.cpp index babb72f..1f4270a 100644
--- a/simonlib/simonrecognizer/sphinxrecognizer.cpp
+++ b/simonlib/simonrecognizer/sphinxrecognizer.cpp
@@ -102,12 +102,7 @@ QList<RecognitionResult> SphinxRecognizer::recognize(const \
QString &file)  return recognitionResults;
   }
 
-  int rv = 
-#ifdef SPHINX_0_8
-      ps_decode_raw(decoder, toRecognize, fName.data(), -1);
-#else
-      ps_decode_raw(decoder, toRecognize, -1);
-#endif
+  int rv = ps_decode_raw(decoder, toRecognize, fName.data(), -1);
   if(rv < 0)
   {
     m_lastError = i18n("Failed to decode \"%1\"", file);
@@ -118,12 +113,8 @@ QList<RecognitionResult> SphinxRecognizer::recognize(const \
QString &file)  
   int score;
   char const *hyp;
-#ifdef SPHINX_0_8
   char const *uttid;
   hyp = ps_get_hyp(decoder, &score, &uttid);
-#else
-  hyp = ps_get_hyp(decoder, &score);
-#endif
   if(!hyp)
   {
     m_lastError = i18n("Cannot get hypothesis for \"%1\"", file);


[prev in list] [next in list] [prev in thread] [next in thread]