From 7779a8f2a4940a73fcc5513fd43d872c881771e3 Mon Sep 17 00:00:00 2001
From: darkeye <darkeye@caa462fc-51d2-11de-8b28-e1b452efc53a>
Date: Thu, 19 Feb 2004 06:47:06 +0000
Subject: [PATCH] finalized OpenBSD port

---
 darkice/trunk/ChangeLog              |  3 ++-
 darkice/trunk/src/DarkIce.cpp        | 16 ++++++++++------
 darkice/trunk/src/SolarisDspSource.h |  7 +++++++
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/darkice/trunk/ChangeLog b/darkice/trunk/ChangeLog
index b00cf20..a566021 100644
--- a/darkice/trunk/ChangeLog
+++ b/darkice/trunk/ChangeLog
@@ -1,6 +1,7 @@
 DarkIce next release
 
-    o ported to OpenBSD, though real-time scheduling not yet supported
+    o ported to OpenBSD, though real-time scheduling not supported,
+      since it is not implemented in OpenBSD
 
 15-02-2004: DarkIce 0.14 released
 
diff --git a/darkice/trunk/src/DarkIce.cpp b/darkice/trunk/src/DarkIce.cpp
index caf881b..dfcb24f 100644
--- a/darkice/trunk/src/DarkIce.cpp
+++ b/darkice/trunk/src/DarkIce.cpp
@@ -875,8 +875,7 @@ DarkIce :: setRealTimeScheduling ( void )               throw ( Exception )
 {
 // don't include the following on OpenBSD, as the scheduling functions are
 // not implemented.
-// FIXME: using HAVE_SYS_AUDIOIO_H as a sign of being on OpenBSD is buggy
-#if !defined( HAVE_SYS_AUDIOIO_H )
+#if !defined( __OpenBSD__ )
     uid_t   euid;
 
     euid = geteuid();
@@ -921,7 +920,10 @@ DarkIce :: setRealTimeScheduling ( void )               throw ( Exception )
         reportEvent( 1,
         "It is recommended that you run this program as super-user");
     }
-#endif
+#else
+    reportEvent( 1, "POSIX scheduling not supported on OpenBSD, "
+                    "this may cause recording skips");
+#endif // __OpenBSD__
 }
 
 
@@ -935,8 +937,7 @@ DarkIce :: setOriginalScheduling ( void )               throw ( Exception )
 {
 // don't include the following on OpenBSD, as the scheduling functions are
 // not implemented.
-// FIXME: using HAVE_SYS_AUDIOIO_H as a sign of being on OpenBSD is buggy
-#if !defined( HAVE_SYS_AUDIOIO_H )
+#if !defined( __OpenBSD__ )
     uid_t   euid;
 
     euid = geteuid();
@@ -956,7 +957,7 @@ DarkIce :: setOriginalScheduling ( void )               throw ( Exception )
 
         reportEvent( 5, "reverted to original scheduling");
     }
-#endif
+#endif // __OpenBSD__
 }
 
 
@@ -1009,6 +1010,9 @@ DarkIce :: run ( void )                             throw ( Exception )
   $Source$
 
   $Log$
+  Revision 1.39  2004/02/19 06:47:06  darkeye
+  finalized OpenBSD port
+
   Revision 1.38  2004/02/18 21:08:11  darkeye
   ported to OpenBSD (real-time scheduling not yet supported)
 
diff --git a/darkice/trunk/src/SolarisDspSource.h b/darkice/trunk/src/SolarisDspSource.h
index 027cedc..7ed49ae 100644
--- a/darkice/trunk/src/SolarisDspSource.h
+++ b/darkice/trunk/src/SolarisDspSource.h
@@ -176,7 +176,11 @@ class SolarisDspSource : public AudioSource, public virtual Reporter
         virtual inline bool
         isBigEndian ( void ) const           throw ()
         {
+#ifdef WORDS_BIGENDIAN
             return true;
+#else
+            return false;
+#endif
         }
 
         /**
@@ -257,6 +261,9 @@ class SolarisDspSource : public AudioSource, public virtual Reporter
   $Source$
 
   $Log$
+  Revision 1.4  2004/02/19 06:47:06  darkeye
+  finalized OpenBSD port
+
   Revision 1.3  2004/02/18 21:08:11  darkeye
   ported to OpenBSD (real-time scheduling not yet supported)