diff options
author | Max Kellermann <max@duempel.org> | 2013-08-04 23:48:01 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2013-08-04 23:48:01 +0200 |
commit | 85b77b81caa40f8bcd03921380246cb5863d5d21 (patch) | |
tree | cf4bc60a6760c52bcbd642a253b45f3bc5ad8775 /src/pcm | |
parent | 5bf2ec5a74bb1247a8cc84e90577eecbee116c62 (diff) | |
download | mpd-85b77b81caa40f8bcd03921380246cb5863d5d21.tar.gz mpd-85b77b81caa40f8bcd03921380246cb5863d5d21.tar.xz mpd-85b77b81caa40f8bcd03921380246cb5863d5d21.zip |
*: use gcc.h macros instead of GLib
Diffstat (limited to 'src/pcm')
-rw-r--r-- | src/pcm/PcmBuffer.cxx | 2 | ||||
-rw-r--r-- | src/pcm/PcmDsdUsb.cxx | 4 | ||||
-rw-r--r-- | src/pcm/PcmResampleInternal.hxx | 4 | ||||
-rw-r--r-- | src/pcm/PcmVolume.cxx | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/pcm/PcmBuffer.cxx b/src/pcm/PcmBuffer.cxx index a70888080..adfd0e518 100644 --- a/src/pcm/PcmBuffer.cxx +++ b/src/pcm/PcmBuffer.cxx @@ -24,7 +24,7 @@ /** * Align the specified size to the next 8k boundary. */ -G_GNUC_CONST +constexpr static size_t align_8k(size_t size) { diff --git a/src/pcm/PcmDsdUsb.cxx b/src/pcm/PcmDsdUsb.cxx index 7d58dec4d..2d0f33a15 100644 --- a/src/pcm/PcmDsdUsb.cxx +++ b/src/pcm/PcmDsdUsb.cxx @@ -22,14 +22,14 @@ #include "PcmBuffer.hxx" #include "AudioFormat.hxx" -G_GNUC_CONST +constexpr static inline uint32_t pcm_two_dsd_to_usb_marker1(uint8_t a, uint8_t b) { return 0xff050000 | (a << 8) | b; } -G_GNUC_CONST +constexpr static inline uint32_t pcm_two_dsd_to_usb_marker2(uint8_t a, uint8_t b) { diff --git a/src/pcm/PcmResampleInternal.hxx b/src/pcm/PcmResampleInternal.hxx index 4ea96daea..5275c090a 100644 --- a/src/pcm/PcmResampleInternal.hxx +++ b/src/pcm/PcmResampleInternal.hxx @@ -65,7 +65,7 @@ pcm_resample_lsr_32(PcmResampler *state, unsigned channels, unsigned src_rate, const int32_t *src_buffer, - G_GNUC_UNUSED size_t src_size, + size_t src_size, unsigned dest_rate, size_t *dest_size_r, GError **error_r); @@ -84,7 +84,7 @@ pcm_resample_fallback_32(PcmResampler *state, unsigned channels, unsigned src_rate, const int32_t *src_buffer, - G_GNUC_UNUSED size_t src_size, + size_t src_size, unsigned dest_rate, size_t *dest_size_r); diff --git a/src/pcm/PcmVolume.cxx b/src/pcm/PcmVolume.cxx index 2a8027400..ff505e29d 100644 --- a/src/pcm/PcmVolume.cxx +++ b/src/pcm/PcmVolume.cxx @@ -64,7 +64,7 @@ pcm_volume_change_16(int16_t *buffer, const int16_t *end, int volume) * multiplication result instead of emulating 64 bit multiplication. */ static inline int32_t -pcm_volume_sample_24(int32_t sample, int32_t volume, G_GNUC_UNUSED int32_t dither) +pcm_volume_sample_24(int32_t sample, int32_t volume, gcc_unused int32_t dither) { int32_t result; |