Fixing API functions exposition

Author: bernardohenz

native_client/deepspeech.cc

@@ -262,20 +262,6 @@ StreamingState::processBatch(const vector<float>& buf, unsigned int n_steps)
                       num_classes);
 }
 
-int
-DS_CreateModel(const char* aModelPath,
-               ModelState** retval)
-{
-  return DS_CreateModel_(aModelPath, false, retval);
-}
-
-int
-DS_CreateModelFromBuffer(const std::string &aModelBuffer,
-                         ModelState** retval)
-{
-  return DS_CreateModel_(aModelBuffer, true, retval);
-}
-
 int
 DS_CreateModel_(const std::string &aModelString,
                 bool init_from_bytes,
@@ -319,6 +305,21 @@ DS_CreateModel_(const std::string &aModelString,
   return DS_ERR_OK;
 }
 
+int
+DS_CreateModel(const char* aModelPath,
+               ModelState** retval)
+{
+  return DS_CreateModel_(aModelPath, false, retval);
+}
+
+int
+DS_CreateModelFromBuffer(const std::string &aModelBuffer,
+                         ModelState** retval)
+{
+  return DS_CreateModel_(aModelBuffer, true, retval);
+}
+
+
 unsigned int
 DS_GetModelBeamWidth(const ModelState* aCtx)
 {
@@ -344,20 +345,6 @@ DS_FreeModel(ModelState* ctx)
   delete ctx;
 }
 
-int
-DS_EnableExternalScorer(ModelState* aCtx,
-                        const char* aScorerPath)
-{
-  return DS_EnableExternalScorer_(aCtx, aScorerPath, false);
-}
-
-int
-DS_EnableExternalScorerFromBuffer(ModelState* aCtx,
-                                  const std::string &aScorerBuffer)
-{
-  return DS_EnableExternalScorer_(aCtx, aScorerBuffer, true);
-}
-
 int
 DS_EnableExternalScorer_(ModelState* aCtx,
                          const std::string &aScorerString,
@@ -374,6 +361,20 @@ DS_EnableExternalScorer_(ModelState* aCtx,
   return DS_ERR_OK;
 }
 
+int
+DS_EnableExternalScorer(ModelState* aCtx,
+                        const char* aScorerPath)
+{
+  return DS_EnableExternalScorer_(aCtx, aScorerPath, false);
+}
+
+int
+DS_EnableExternalScorerFromBuffer(ModelState* aCtx,
+                                  const std::string &aScorerBuffer)
+{
+  return DS_EnableExternalScorer_(aCtx, aScorerBuffer, true);
+}
+
 int
 DS_AddHotWord(ModelState* aCtx,
               const char* word,

native_client/deepspeech.h

@@ -122,20 +122,6 @@ int DS_CreateModelFromBuffer(const std::string &aModelBuffer,
                              ModelState** retval);
 
 
-/**
- * @brief An object providing an interface to a trained DeepSpeech model.
- *
- * @param aModelString The path/string for initializing the model graph.
- * @param init_from_bytes Wheter the model will be initialized using path or array of bytes.
- * @param[out] retval a ModelState pointer
- *
- * @return Zero on success, non-zero on failure.
- */
-DEEPSPEECH_EXPORT
-int DS_CreateModel_(const std::string &aModelString,
-                    bool init_from_bytes,
-                    ModelState** retval);
-
 /**
  * @brief Get beam width value used by the model. If {@link DS_SetModelBeamWidth}
  *        was not called before, will return the default value loaded from the
@@ -201,19 +187,6 @@ DEEPSPEECH_EXPORT
 int DS_EnableExternalScorerFromBuffer(ModelState* aCtx,
                                       const std::string &aScorerBuffer);
 
-/**
- * @brief Enable decoding using an external scorer.
- *
- * @param aCtx The ModelState pointer for the model being changed.
- * @param aScorerString The path/array_of_bytes to initialize the external scorer.
- * @param init_from_bytes Wheter the scorer will be initialized by file or array of bytes.
- *
- * @return Zero on success, non-zero on failure (invalid arguments).
- */
-DEEPSPEECH_EXPORT                  
-int DS_EnableExternalScorer_(ModelState* aCtx,
-                             const std::string &aScorerString,
-                             bool init_from_bytes);
 
 /**
  * @brief Add a hot-word and its boost.