Move bswap.h to libmythbase

The calls for bswap_* in the audio code could not use the common bswap.h file due to it being located in libmythtv. I moved it to libmythbase so it can be used. Also, you will want to do a make distclean. ABI version bumped.
MythTV · May 9, 2012 · 6149533 · 6149533
1 parent fb90f73
commit 6149533
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 26 deletions.
diff --git a/mythtv/libs/libmyth/audio/audiooutpututil.cpp b/mythtv/libs/libmyth/audio/audiooutpututil.cpp
@@ -4,17 +4,7 @@
 #include "audiooutpututil.h"
 #include <sys/types.h>
 #include <inttypes.h>
-#if HAVE_BYTESWAP_H
-#include <byteswap.h>
-#elif HAVE_SYS_ENDIAN_H
-#include <sys/endian.h>
-#elif CONFIG_DARWIN
-#include <libkern/OSByteOrder.h>
-#define bswap_16 OSSwapInt16
-#define bswap_32 OSSwapInt32
-#elif HAVE_BIGENDIAN
-#error No bswap functions defined
-#endif
+#include "bswap.h"
 
 #define LOC QString("AOUtil: ")
 

diff --git a/mythtv/libs/libmyth/audio/eldutils.cpp b/mythtv/libs/libmyth/audio/eldutils.cpp
@@ -27,18 +27,7 @@
 #include "eldutils.h"
 #include <sys/types.h>
 #include <inttypes.h>
-#if HAVE_BYTESWAP_H
-#include <byteswap.h>
-#elif HAVE_SYS_ENDIAN_H
-#include <sys/endian.h>
-#elif CONFIG_DARWIN
-#include <libkern/OSByteOrder.h>
-#define bswap_16 OSSwapInt16
-#define bswap_32 OSSwapInt32
-#define bswap_64 OSSwapInt64
-#elif HAVE_BIGENDIAN
-#error No bswap functions defined
-#endif
+#include "bswap.h"
 #include "audiooutputbase.h"
 #include <QString>
 

diff --git a/mythtv/libs/libmythtv/bswap.h → mythtv/libs/libmythbase/bswap.h b/mythtv/libs/libmythtv/bswap.h → mythtv/libs/libmythbase/bswap.h
diff --git a/mythtv/libs/libmythbase/libmythbase.pro b/mythtv/libs/libmythbase/libmythbase.pro
@@ -24,7 +24,7 @@ HEADERS += mythmiscutil.h mythhdd.h mythcdrom.h autodeletedeque.h dbutil.h
 HEADERS += mythhttppool.h mythhttphandler.h mythdeque.h mythlogging.h
 HEADERS += mythbaseutil.h referencecounter.h version.h mythcommandlineparser.h
 HEADERS += mythscheduler.h filesysteminfo.h hardwareprofile.h serverpool.h
-HEADERS += plist.h
+HEADERS += plist.h bswap.h
 
 SOURCES += mthread.cpp mthreadpool.cpp
 SOURCES += mythsocket.cpp mythsocketthread.cpp msocketdevice.cpp
@@ -66,7 +66,7 @@ inc.files += mythtranslation.h iso639.h iso3166.h mythmedia.h mythmiscutil.h
 inc.files += mythcdrom.h autodeletedeque.h dbutil.h mythhttppool.h mythdeque.h
 inc.files += referencecounter.h mythcommandlineparser.h mthread.h mthreadpool.h
 inc.files += filesysteminfo.h hardwareprofile.h bonjourregister.h serverpool.h
-inc.files += plist.h
+inc.files += plist.h bswap.h
 
 # Allow both #include <blah.h> and #include <libmythbase/blah.h>
 inc2.path  = $${PREFIX}/include/mythtv/libmythbase

diff --git a/mythtv/libs/libmythbase/mythversion.h b/mythtv/libs/libmythbase/mythversion.h
@@ -12,7 +12,7 @@
 /// Update this whenever the plug-in API changes.
 /// Including changes in the libmythbase, libmyth, libmythtv, libmythav* and
 /// libmythui class methods used by plug-ins.
-#define MYTH_BINARY_VERSION "0.26.20120504-1"
+#define MYTH_BINARY_VERSION "0.26.20120509-1"
 
 /** \brief Increment this whenever the MythTV network protocol changes.
  *