# HG changeset patch
# User Vytautas Jančauskas <unaudio@gmail.com>
# Date 1378926347 -10800
# Node ID 2e174b5e7703a3442c826fcbc74c847c1c12255d
# Parent  c2031ad6dbe73f69b5681b412c57ec01f54b3dd9
Fix audiodevinfo, audioinfo, audioread and audiowrite build process

* audiodevinfo.cc: added bits_to_format utility function
* audioinfo.cc, audioread.cc, audiowrite.cc: make sure to not attempt to
include sndfile.h if it is not present

diff -r c2031ad6dbe7 -r 2e174b5e7703 libinterp/dldfcn/audiodevinfo.cc
--- a/libinterp/dldfcn/audiodevinfo.cc	Wed Sep 11 21:32:14 2013 +0300
+++ b/libinterp/dldfcn/audiodevinfo.cc	Wed Sep 11 22:05:47 2013 +0300
@@ -2,7 +2,33 @@
 #include "ov-struct.h"
 #include <portaudio.h>
 
-#include "common.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;
+    }
+}
   
 DEFUN_DLD(audiodevinfo, args, ,
 "-*- texinfo -*-\n\
diff -r c2031ad6dbe7 -r 2e174b5e7703 libinterp/dldfcn/audioinfo.cc
--- a/libinterp/dldfcn/audioinfo.cc	Wed Sep 11 21:32:14 2013 +0300
+++ b/libinterp/dldfcn/audioinfo.cc	Wed Sep 11 22:05:47 2013 +0300
@@ -1,6 +1,8 @@
 #include "oct.h"
 #include "ov-struct.h"
-#include <sndfile.h>
+#ifdef HAVE_SNDFILE
+  #include <sndfile.h>
+#endif
   
 DEFUN_DLD(audioinfo, args, ,
 "-*- texinfo -*-\n\
diff -r c2031ad6dbe7 -r 2e174b5e7703 libinterp/dldfcn/audioread.cc
--- a/libinterp/dldfcn/audioread.cc	Wed Sep 11 21:32:14 2013 +0300
+++ b/libinterp/dldfcn/audioread.cc	Wed Sep 11 22:05:47 2013 +0300
@@ -1,6 +1,8 @@
 #include "oct.h"
 #include "ov-struct.h"
-#include <sndfile.h>
+#ifdef HAVE_SNDFILE
+  #include <sndfile.h>
+#endif
   
 DEFUN_DLD(audioread, args, ,
 "-*- texinfo -*-\n\
diff -r c2031ad6dbe7 -r 2e174b5e7703 libinterp/dldfcn/audiowrite.cc
--- a/libinterp/dldfcn/audiowrite.cc	Wed Sep 11 21:32:14 2013 +0300
+++ b/libinterp/dldfcn/audiowrite.cc	Wed Sep 11 22:05:47 2013 +0300
@@ -1,6 +1,8 @@
 #include "oct.h"
 #include "ov-struct.h"
-#include <sndfile.h>
+#ifdef HAVE_SNDFILE
+  #include <sndfile.h>
+#endif
 #include <string>
 #include <map>