Adding the 'cb' model, and some fixes to make model files work.

Author: GregorR

Makefile.am

@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
-AM_CFLAGS = -I$(top_srcdir)/include $(DEPS_CFLAGS)
+AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src $(DEPS_CFLAGS)
 
 dist_doc_DATA = COPYING AUTHORS README
 
@@ -22,7 +22,9 @@ librnnoise_la_SOURCES = \
 	src/denoise.c \
 	src/rnn.c \
 	src/rnn_data.c \
+	src/models/cb.c \
 	src/rnn_reader.c \
+	src/models.c \
 	src/pitch.c \
 	src/kiss_fft.c \
 	src/celt_lpc.c

include/rnnoise.h

@@ -61,4 +61,8 @@ RNNOISE_EXPORT RNNModel *rnnoise_model_from_file(FILE *f);
 
 RNNOISE_EXPORT void rnnoise_model_free(RNNModel *model);
 
+RNNOISE_EXPORT const char **rnnoise_models(void);
+
+RNNOISE_EXPORT RNNModel *rnnoise_get_model(const char *name);
+
 #endif

src/models.c

@@ -0,0 +1,64 @@
+/* Copyright (c) Gregor Richards */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <string.h>
+
+#include "rnnoise.h"
+
+/* This file is just a list of the built-in models and a way of fetching them.
+ * Nothing fancy. */
+
+static const char *model_names[] = {
+    "orig",
+    "cb",
+    NULL
+};
+
+extern const struct RNNModel model_orig, model_cb;
+
+static const struct RNNModel *models[] = {
+    &model_orig,
+    &model_cb
+};
+
+const char **rnnoise_models()
+{
+    return model_names;
+}
+
+RNNModel *rnnoise_get_model(const char *name)
+{
+    int i;
+    for (i = 0; model_names[i]; i++) {
+        if (!strcmp(name, model_names[i]))
+            return (RNNModel *) models[i];
+    }
+    return NULL;
+}