Index: rtEq/Audio.cc
diff -c rtEq/Audio.cc:1.1 rtEq/Audio.cc:1.2
*** rtEq/Audio.cc:1.1	Sat Dec  9 22:56:13 2000
--- rtEq/Audio.cc	Mon Dec 18 23:37:36 2000
***************
*** 17,30 ****
      along with this program; if not, write to the Free Software
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  
-     Version 1.0 : Basic functionality
-     Version 1.1 : Fixed some typos
-     Version 1.2 : GetCaps() and full duplex support
-     Version 1.3 : Fixed some stupid cosmetic bugs
-     Version 1.4 : Added GetHandle()
-     Version 1.5 : Overloaded constructor
-     Version 2.0 : Almost full set of functions
- 
  */
  
  
--- 17,22 ----
***************
*** 463,468 ****
--- 455,461 ----
  }
  
  
+ #ifndef USE_OSSLITE
  bool clAudio::GetErrorInfo (audio_errinfo *spErrorInfo)
  {
      iErrorCode = 0;
***************
*** 473,478 ****
--- 466,472 ----
      }
      return true;
  }
+ #endif
  
  
  int clAudio::GetVersion ()
Index: rtEq/Audio.hh
diff -c rtEq/Audio.hh:1.1 rtEq/Audio.hh:1.2
*** rtEq/Audio.hh:1.1	Sat Dec  9 22:56:13 2000
--- rtEq/Audio.hh	Mon Dec 18 23:37:36 2000
***************
*** 17,30 ****
      along with this program; if not, write to the Free Software
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  
-     Version 1.0 : Basic functionality
-     Version 1.1 : Fixed some typos
-     Version 1.2 : GetCaps() and full duplex support
-     Version 1.3 : Fixed some stupid cosmetic bugs
-     Version 1.4 : Added GetHandle()
-     Version 1.5 : Overloaded constructor
-     Version 2.0 : Almost full set of functions
- 
  */
  
  
--- 17,22 ----
***************
*** 113,119 ****
--- 105,113 ----
                  // Map input/output buffer
              int GetOutDelay ();
                  // Get output delay
+             #ifndef USE_OSSLITE
              bool GetErrorInfo (audio_errinfo *);
+             #endif
                  // Get audio error information (OSS 3.9.x specific)
              int GetVersion ();
                  // Get OSS version
Index: rtEq/EqOInMod.cc
diff -c rtEq/EqOInMod.cc:1.1 rtEq/EqOInMod.cc:1.2
*** rtEq/EqOInMod.cc:1.1	Sun Dec 17 15:47:25 2000
--- rtEq/EqOInMod.cc	Mon Dec 18 23:37:36 2000
***************
*** 57,67 ****
--- 57,71 ----
              iAFormat = AFMT_S16_NE;
              lDevDataSize = lDataCount * sizeof(signed short);
              break;
+ #       ifndef USE_OSSLITE
          case 24:
          case 32:
              iAFormat = AFMT_S32_NE;
              lDevDataSize = lDataCount * sizeof(signed int);
              break;
+ #       endif
+         default:
+             g_warning("Unsupported wordlength! (in)");
      }
      lInDataSize = lDataCount * sizeof(rteq_t);
      DevBuf.Size(lDevDataSize);
***************
*** 75,81 ****
          g_warning("Failed to open device %s! (in)", cpInDev);
          return;
      }
!     g_message("Device open ch %i fs %i fmt %xh (out)",
          iAChannels, iASampleRate, iAFormat);
  }
  
--- 79,85 ----
          g_warning("Failed to open device %s! (in)", cpInDev);
          return;
      }
!     g_message("Device open ch %i fs %i fmt %xh (in)",
          iAChannels, iASampleRate, iAFormat);
  }
  
***************
*** 102,107 ****
--- 106,112 ----
                  DSP.Convert(fpLInBuf, (signed short *) DevBuf, lDataCount,
                      false);
                  break;
+ #           ifndef USE_OSSLITE
              case 24:
                  DSP.Convert(fpLInBuf, (signed int *) DevBuf, lDataCount,
                      true);
***************
*** 110,115 ****
--- 115,121 ----
                  DSP.Convert(fpLInBuf, (signed int *) DevBuf, lDataCount,
                      false);
                  break;
+ #           endif
          }
          MtxIn.Wait();
          memcpy(InBuf, LInBuf, lInDataSize);
Index: rtEq/EqOOutMod.cc
diff -c rtEq/EqOOutMod.cc:1.4 rtEq/EqOOutMod.cc:1.5
*** rtEq/EqOOutMod.cc:1.4	Sun Dec 17 15:47:04 2000
--- rtEq/EqOOutMod.cc	Mon Dec 18 23:37:36 2000
***************
*** 55,65 ****
--- 55,69 ----
              iAFormat = AFMT_S16_NE;
              lDevDataSize = RTEQ_WIN_SIZE * iChannels * sizeof(signed short);
              break;
+ #       ifndef USE_OSSLITE
          case 24:
          case 32:
              iAFormat = AFMT_S32_NE;
              lDevDataSize = RTEQ_WIN_SIZE * iChannels * sizeof(signed int);
              break;
+ #       endif
+         default:
+             g_warning("Unsupported worldlength! (out)");
      }
      lOutDataSize = RTEQ_WIN_SIZE * iChannels * sizeof(rteq_t);
      LOutBuf.Size(lOutDataSize);
***************
*** 111,116 ****
--- 115,121 ----
                  DSP.Convert((signed short *) DevBuf, fpOutBuf, lDataCount,
                      false);
                  break;
+ #           ifndef USE_OSSLITE
              case 24:
                  DSP.Convert((signed int *) DevBuf, fpOutBuf, lDataCount,
                      true);
***************
*** 119,124 ****
--- 124,130 ----
                  DSP.Convert((signed int *) DevBuf, fpOutBuf, lDataCount,
                      false);
                  break;
+ #           endif
          }
          Audio.Write(DevBuf, lDevDataSize);
      }
Index: rtEq/Makefile
diff -c rtEq/Makefile:1.5 rtEq/Makefile:1.6
*** rtEq/Makefile:1.5	Sun Dec 17 15:47:04 2000
--- rtEq/Makefile	Mon Dec 18 23:37:36 2000
***************
*** 19,25 ****
  
  CXX = g++
  CXXFLAGS = -mcpu=k6 -march=k6 -O6 -fomit-frame-pointer -ffast-math -funroll-loops -malign-loops=3 -malign-jumps=3 -malign-functions=3 -mpreferred-stack-boundary=3 -mfancy-math-387 -Wall
! DEFS = -D_REENTRANT -D_THREAD_SAFE
  INCS = `gtk-config --cflags`
  LIBS = -ldsp -lasound `gtk-config --libs` -lpthread -lm #-lefence
  
--- 19,25 ----
  
  CXX = g++
  CXXFLAGS = -mcpu=k6 -march=k6 -O6 -fomit-frame-pointer -ffast-math -funroll-loops -malign-loops=3 -malign-jumps=3 -malign-functions=3 -mpreferred-stack-boundary=3 -mfancy-math-387 -Wall
! DEFS = -D_REENTRANT -D_THREAD_SAFE #-DUSE_OSSLITE
  INCS = `gtk-config --cflags`
  LIBS = -ldsp -lasound `gtk-config --libs` -lpthread -lm #-lefence