diff options
Diffstat (limited to 'gr-blocks')
| -rw-r--r-- | gr-blocks/grc/blocks_keep_m_in_n.xml | 2 | ||||
| -rw-r--r-- | gr-blocks/lib/wavfile.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gr-blocks/grc/blocks_keep_m_in_n.xml b/gr-blocks/grc/blocks_keep_m_in_n.xml index 9e861749bb..824955c412 100644 --- a/gr-blocks/grc/blocks_keep_m_in_n.xml +++ b/gr-blocks/grc/blocks_keep_m_in_n.xml @@ -62,7 +62,7 @@ </param> <check>$n > 0</check> <check>$m > 0</check> - <check>$m < $n</check> + <check>$m <= $n</check> <sink> <name>in</name> <type>$type</type> diff --git a/gr-blocks/lib/wavfile.cc b/gr-blocks/lib/wavfile.cc index e741cbab4e..1a5b3ff35f 100644 --- a/gr-blocks/lib/wavfile.cc +++ b/gr-blocks/lib/wavfile.cc @@ -38,14 +38,14 @@ namespace gr { // Define host to/from worknet (little endian) short and long #ifdef BOOST_BIG_ENDIAN - static inline uint16_t __wav_bs16(uint16_t x) + static inline uint16_t __gri_wav_bs16(uint16_t x) { return (x>>8) | (x<<8); } - static inline uint32_t __wav_bs32(uint32_t x) + static inline uint32_t __gri_wav_bs32(uint32_t x) { - return (uint32_t(__wav_bs16(uint16_t(x&0xfffful)))<<16) | (__wav_bs16(uint16_t(x>>16))); + return (uint32_t(__gri_wav_bs16(uint16_t(x&0xfffful)))<<16) | (__gri_wav_bs16(uint16_t(x>>16))); } #define htowl(x) __gri_wav_bs32(x) |