# HG changeset patch
# User Vytautas Jančauskas <unaudio@gmail.com>
# Date 1379001745 -10800
# Node ID b8ea3ff8f5fdffb9df945906131f66a03f380460
# Parent  81e7bfb2e87217e921c48bd606a94c01f1980243
include player_class.cc and recorder_class.cc in __player_audioplayer__.cc

* __player_audioplayer__.cc: include player_class.cc and recorder_class.cc
* module-files: remove lines to build player_class.cc and recorder_class.cc,
add a line to build __player_audioplayer__.cc
* recorder_class.cc: remove bits_to_format utility function

diff -r 81e7bfb2e872 -r b8ea3ff8f5fd libinterp/dldfcn/__player_audioplayer__.cc
--- a/libinterp/dldfcn/__player_audioplayer__.cc	Thu Sep 12 01:08:38 2013 +0300
+++ b/libinterp/dldfcn/__player_audioplayer__.cc	Thu Sep 12 19:02:25 2013 +0300
@@ -1,7 +1,8 @@
 #include "oct.h"
 #include "ov-struct.h"
 
-#include "player_class.h"
+#include "player_class.cc"
+#include "recorder_class.cc"
    
 DEFUN_DLD(__player_audioplayer__, args, ,
 "__player_audioplayer__"
diff -r 81e7bfb2e872 -r b8ea3ff8f5fd libinterp/dldfcn/module-files
--- a/libinterp/dldfcn/module-files	Thu Sep 12 01:08:38 2013 +0300
+++ b/libinterp/dldfcn/module-files	Thu Sep 12 19:02:25 2013 +0300
@@ -24,6 +24,4 @@
 audiowrite.cc|$(SNDFILE_CPPFLAGS)|$(SNDFILE_LDFLAGS)|$(SNDFILE_LIBS)
 audioinfo.cc|$(SNDFILE_CPPFLAGS)|$(SNDFILE_LDFLAGS)|$(SNDFILE_LIBS)
 audiodevinfo.cc|$(PORTAUDIO_CPPFLAGS)|$(PORTAUDIO_LDFLAGS)|$(PORTAUDIO_LIBS)
-player_class.cc|$(PORTAUDIO_CPPFLAGS)|$(PORTAUDIO_LDFLAGS)|$(PORTAUDIO_LIBS)
-recorder_class.cc|$(PORTAUDIO_CPPFLAGS)|$(PORTAUDIO_LDFLAGS)|$(PORTAUDIO_LIBS)
-__player_audioplayer__.cc
\ No newline at end of file
+__player_audioplayer__.cc|$(PORTAUDIO_CPPFLAGS)|$(PORTAUDIO_LDFLAGS)|$(PORTAUDIO_LIBS)
\ No newline at end of file
diff -r 81e7bfb2e872 -r b8ea3ff8f5fd libinterp/dldfcn/recorder_class.cc
--- a/libinterp/dldfcn/recorder_class.cc	Thu Sep 12 01:08:38 2013 +0300
+++ b/libinterp/dldfcn/recorder_class.cc	Thu Sep 12 19:02:25 2013 +0300
@@ -7,34 +7,6 @@
 #include "player_class.h"
 #include "recorder_class.h"
 
-PaSampleFormat bits_to_format(int bits)
-{
-  if (bits == 8)
-    {
-      return paInt8;
-    }
-  else if (bits == 16)
-    {
-      return paInt16;
-    }
-  else if (bits == 24)
-    {
-      return paInt24;
-    }
-  else if (bits == 32)
-    {
-      return paInt32;
-    }
-  else if (bits == -1)
-    {
-      return paFloat32;
-    }
-  else 
-    {
-      return 0;
-    }
-}
-
 #define BUFFER_SIZE 512
 
 DEFINE_OCTAVE_ALLOCATOR (audiorecorder);