Removed narrowband 256x8 codebook from build.Speex-0.1.0

git-svn-id: http://svn.xiph.org/trunk/speex@3307 0101bb08-14d6-0310-b084-bc0e0c8e3800

5 files changed, 14 insertions, 12 deletions

diff --git a/configure.in b/configure.in
index 8c8c016..2005ee3 100644
--- a/configure.in
+++ b/configure.in
@@ -33,7 +33,7 @@ AM_PROG_LIBTOOL
 
 AC_CHECK_HEADER(ogg/ogg.h)
 AC_CHECK_LIB(m, sin)
-AC_CHECK_LIB(ogg, ogg_stream_init, , [ echo; echo "error: libogg is now required by speex"; echo "Get it from: http://www.ogg.org/ogg/index.html"; exit 1 ])
+AC_CHECK_LIB(ogg, ogg_stream_init, [LIB_OGG='-logg'; AC_SUBST(LIB_OGG)] , [ echo; echo "error: libogg is now required by speex"; echo "Get it from: http://www.ogg.org/ogg/index.html"; exit 1 ])
 AC_FUNC_ALLOCA
 dnl AC_DEFINE(VERSION, "$VERSION")
 AC_DEFINE_UNQUOTED(VERSION, "${VERSION}")
diff --git a/libspeex/Makefile.am b/libspeex/Makefile.am
index fff0d86..6133824 100644
--- a/libspeex/Makefile.am
+++ b/libspeex/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in. -*-Makefile-*-
 
-# $Id: Makefile.am,v 1.27 2002/05/14 03:25:47 jmvalin Exp $
+# $Id: Makefile.am,v 1.28 2002/05/15 21:47:51 jmvalin Exp $
 
 # Disable automatic dependency tracking if using other tools than gcc and gmake
 #AUTOMAKE_OPTIONS = no-dependencies
@@ -26,7 +26,6 @@ libspeex_la_SOURCES = nb_celp.c \
 	vbr.c \
 	hexc_table.c \
 	exc_5_256_table.c \
-	exc_8_256_table.c \
 	exc_5_64_table.c
 
 
diff --git a/libspeex/modes.c b/libspeex/modes.c
index 81dabd6..a22f333 100644
--- a/libspeex/modes.c
+++ b/libspeex/modes.c
@@ -32,7 +32,7 @@
 extern float gain_cdbk_nb[];
 extern float hexc_table[];
 extern float exc_5_256_table[];
-extern float exc_8_256_table[];
+/*extern float exc_8_256_table[];*/
 extern float exc_5_64_table[];
 
 /* Parameters for Long-Term Prediction (LTP)*/
diff --git a/src/Makefile.am b/src/Makefile.am
index 1a8269d..7c7a577 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in. -*-Makefile-*-
 
-# $Id: Makefile.am,v 1.2 2002/03/27 06:30:37 jmvalin Exp $
+# $Id: Makefile.am,v 1.3 2002/05/15 21:47:51 jmvalin Exp $
 
 # Disable automatic dependency tracking if using other tools than gcc and gmake
 #AUTOMAKE_OPTIONS = no-dependencies
@@ -13,7 +13,7 @@ noinst_HEADERS =
 bin_PROGRAMS = speexenc speexdec
 
 speexenc_SOURCES = speexenc.c
-speexenc_LDADD = $(top_srcdir)/libspeex/libspeex.la
+speexenc_LDADD = $(top_srcdir)/libspeex/libspeex.la $(LIB_OGG)
 
 speexdec_SOURCES = speexdec.c
-speexdec_LDADD = $(top_srcdir)/libspeex/libspeex.la
+speexdec_LDADD = $(top_srcdir)/libspeex/libspeex.la $(LIB_OGG)
diff --git a/src/speexenc.c b/src/speexenc.c
index e5d32fb..7528b02 100644
--- a/src/speexenc.c
+++ b/src/speexenc.c
@@ -25,13 +25,14 @@
 #include "speex.h"
 #include <ogg/ogg.h>
 
+/*Write an Ogg page to a file pointer*/
 int oe_write_page(ogg_page *page, FILE *fp)
 {
-	int written;
-	written = fwrite(page->header,1,page->header_len, fp);
-	written += fwrite(page->body,1,page->body_len, fp);
-
-	return written;
+   int written;
+   written = fwrite(page->header,1,page->header_len, fp);
+   written += fwrite(page->body,1,page->body_len, fp);
+   
+   return written;
 }
 
 #define MAX_FRAME_SIZE 2000
@@ -235,6 +236,7 @@ int main(int argc, char **argv)
       op.packetno = id;
       ogg_stream_packetin(&os, &op);
 
+      /*Write all new pages (not likely 0 or 1)*/
       while (ogg_stream_pageout(&os,&og))
       {
          ret = oe_write_page(&og, fout);
@@ -255,6 +257,7 @@ int main(int argc, char **argv)
    op.granulepos = id+1;
    op.packetno = id+1;
    ogg_stream_packetin(&os, &op);
+   /*Flush all pages left to be written*/
    while (ogg_stream_flush(&os, &og))
    {
       ret = oe_write_page(&og, fout);