From 17ec06eb282f26a29ca2c0c03a36a52800958b02 Mon Sep 17 00:00:00 2001
From: darkeye <darkeye@caa462fc-51d2-11de-8b28-e1b452efc53a>
Date: Sat, 15 Sep 2001 11:35:08 +0000
Subject: [PATCH] minor fixes

---
 darkice/trunk/src/LameLibEncoder.cpp | 37 ++++++++++++++--------------
 darkice/trunk/src/LameLibEncoder.h   |  5 +++-
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/darkice/trunk/src/LameLibEncoder.cpp b/darkice/trunk/src/LameLibEncoder.cpp
index 6c547e1..7421bc2 100644
--- a/darkice/trunk/src/LameLibEncoder.cpp
+++ b/darkice/trunk/src/LameLibEncoder.cpp
@@ -33,12 +33,6 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#error need string.h
-#endif
-
 
 #include "Exception.h"
 #include "Util.h"
@@ -215,7 +209,7 @@ LameLibEncoder :: conv8 (   unsigned char     * pcmBuffer,
         for ( i = 0, j = 0; i < lenPcmBuffer; ) {
             unsigned short int  value;
 
-            value       = pcmBuffer[i++];
+            value         = pcmBuffer[i++];
             leftBuffer[j] = (short int) value;
             ++j;
         }
@@ -225,9 +219,9 @@ LameLibEncoder :: conv8 (   unsigned char     * pcmBuffer,
         for ( i = 0, j = 0; i < lenPcmBuffer; ) {
             unsigned short int  value;
 
-            value  = pcmBuffer[i++];
-            leftBuffer[j] = (short int) value;
-            value  = pcmBuffer[i++];
+            value          = pcmBuffer[i++];
+            leftBuffer[j]  = (short int) value;
+            value          = pcmBuffer[i++];
             rightBuffer[j] = (short int) value;
             ++j;
         }
@@ -252,9 +246,9 @@ LameLibEncoder :: conv16 (  unsigned char     * pcmBuffer,
         for ( i = 0, j = 0; i < lenPcmBuffer; ) {
             unsigned short int   value;
 
-            value  = pcmBuffer[i++];
-            value += pcmBuffer[i++] << 8;
-            leftBuffer[j] = (short int) value;
+            value          = pcmBuffer[i++];
+            value         |= pcmBuffer[i++] << 8;
+            leftBuffer[j]  = (short int) value;
             ++j;
         }
     } else {
@@ -263,12 +257,12 @@ LameLibEncoder :: conv16 (  unsigned char     * pcmBuffer,
         for ( i = 0, j = 0; i < lenPcmBuffer; ) {
             unsigned short int   value;
 
-            value  = pcmBuffer[i++];
-            value += pcmBuffer[i++] << 8;
-            leftBuffer[j] = (short int) value;
-            value  = pcmBuffer[i++];
-            value += pcmBuffer[i++] << 8;
-            rightBuffer[j] = (short int) value;
+            value           = pcmBuffer[i++];
+            value          |= pcmBuffer[i++] << 8;
+            leftBuffer[j]   = (short int) value;
+            value           = pcmBuffer[i++];
+            value          |= pcmBuffer[i++] << 8;
+            rightBuffer[j]  = (short int) value;
             ++j;
         }
     }
@@ -366,6 +360,8 @@ LameLibEncoder :: flush ( void )
                      "couldn't write all from encoder to underlying sink",
                      ret - written);
     }
+
+    sink->flush();
 }
 
 
@@ -389,6 +385,9 @@ LameLibEncoder :: close ( void )                    throw ( Exception )
   $Source$
 
   $Log$
+  Revision 1.6  2001/09/15 11:35:08  darkeye
+  minor fixes
+
   Revision 1.5  2001/09/02 09:54:12  darkeye
   fixed typos in CVS substition keywords
 
diff --git a/darkice/trunk/src/LameLibEncoder.h b/darkice/trunk/src/LameLibEncoder.h
index b8025ce..97c653d 100644
--- a/darkice/trunk/src/LameLibEncoder.h
+++ b/darkice/trunk/src/LameLibEncoder.h
@@ -40,7 +40,7 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_LAME_LIB
+#ifdef HAVE_LAME_LAME_H
 #include <lame/lame.h>
 #else
 #error need lame/lame.h
@@ -462,6 +462,9 @@ class LameLibEncoder : public AudioEncoder, public virtual Reporter
   $Source$
 
   $Log$
+  Revision 1.7  2001/09/15 11:35:08  darkeye
+  minor fixes
+
   Revision 1.6  2001/09/14 19:31:06  darkeye
   added IceCast2 / vorbis support