diff options
author | Tom Rondeau | 2012-06-23 09:25:46 -0400 |
---|---|---|
committer | Tom Rondeau | 2012-06-23 09:25:46 -0400 |
commit | bf8700a226091c5ce0130a3819a4c12b9d9981a6 (patch) | |
tree | 2ef8caa8d8ab264b0387c6618f3763d464320ccf /gnuradio-core/src | |
parent | c94ddc5e0c08693c023c099bd8946ca6e143f471 (diff) | |
parent | 82f6a4ee66ce37b67a62af8924b1727e77c68816 (diff) | |
download | gnuradio-bf8700a226091c5ce0130a3819a4c12b9d9981a6.tar.gz gnuradio-bf8700a226091c5ce0130a3819a4c12b9d9981a6.tar.bz2 gnuradio-bf8700a226091c5ce0130a3819a4c12b9d9981a6.zip |
Merge branch 'master' of gnuradio.org:gnuradio
Diffstat (limited to 'gnuradio-core/src')
-rw-r--r-- | gnuradio-core/src/lib/io/gri_wavfile.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gnuradio-core/src/lib/io/gri_wavfile.cc b/gnuradio-core/src/lib/io/gri_wavfile.cc index 3bc9d8fad..780bd1b98 100644 --- a/gnuradio-core/src/lib/io/gri_wavfile.cc +++ b/gnuradio-core/src/lib/io/gri_wavfile.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2008 Free Software Foundation, Inc. + * Copyright 2004,2008,2012 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -27,7 +27,7 @@ #include <gri_wavfile.h> #include <cstring> #include <stdint.h> -#include <gruel/inet.h> +#include <boost/asio.hpp> # define VALID_COMPRESSION_TYPE 0x0001 @@ -36,12 +36,12 @@ // Basically, this is the opposite of htonx() and ntohx() #ifdef WORDS_BIGENDIAN -static inline uint32_t host_to_wav(uint32_t x) { return bswap_32(x); } -static inline uint16_t host_to_wav(uint16_t x) { return bswap_16(x); } -static inline int16_t host_to_wav(int16_t x) { return bswap_16(x); } -static inline uint32_t wav_to_host(uint32_t x) { return bswap_32(x); } -static inline uint16_t wav_to_host(uint16_t x) { return bswap_16(x); } -static inline int16_t wav_to_host(int16_t x) { return bswap_16(x); } +static inline uint32_t host_to_wav(uint32_t x) { return htonl(x); } +static inline uint16_t host_to_wav(uint16_t x) { return htons(x); } +static inline int16_t host_to_wav(int16_t x) { return htons(x); } +static inline uint32_t wav_to_host(uint32_t x) { return ntohl(x); } +static inline uint16_t wav_to_host(uint16_t x) { return ntohs(x); } +static inline int16_t wav_to_host(int16_t x) { return ntohs(x); } #else |