pcm_buffer: un-inline pcm_buffer_get()

This method is too complex for inlining.

3 files changed, 46 insertions, 15 deletions

diff --git a/Makefile.am b/Makefile.am
index 45dd631af..0d1c9bb3b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -144,7 +144,6 @@ mpd_headers = \
 	src/output/pulse_output_plugin.h \
 	src/output/winmm_output_plugin.h \
 	src/page.h \
-	src/pcm_buffer.h \
 	src/pcm_utils.h \
 	src/pcm_convert.h \
 	src/pcm_volume.h \
@@ -300,6 +299,7 @@ src_mpd_SOURCES = \
 	src/path.c \
 	src/mapper.c \
 	src/page.c \
+	src/pcm_buffer.c src/pcm_buffer.h \
 	src/pcm_convert.c \
 	src/pcm_volume.c \
 	src/pcm_mix.c \
@@ -928,6 +928,7 @@ test_run_decoder_SOURCES = test/run_decoder.c \
 	src/audio_check.c \
 	src/audio_format.c \
 	src/timer.c \
+	src/pcm_buffer.c \
 	$(ARCHIVE_SRC) \
 	$(INPUT_SRC) \
 	$(TAG_SRC) \
@@ -950,6 +951,7 @@ test_read_tags_SOURCES = test/read_tags.c \
 	src/fd_util.c \
 	src/audio_check.c \
 	src/timer.c \
+	src/pcm_buffer.c \
 	$(ARCHIVE_SRC) \
 	$(INPUT_SRC) \
 	$(TAG_SRC) \
@@ -968,6 +970,7 @@ test_run_filter_SOURCES = test/run_filter.c \
 	src/pcm_format.c src/pcm_channels.c src/pcm_dither.c \
 	src/pcm_pack.c \
 	src/pcm_resample.c src/pcm_resample_fallback.c \
+	src/pcm_buffer.c \
 	src/audio_check.c \
 	src/audio_format.c \
 	src/audio_parser.c \
@@ -990,6 +993,7 @@ test_run_encoder_SOURCES = test/run_encoder.c \
 	src/audio_check.c \
 	src/audio_format.c \
 	src/audio_parser.c \
+	src/pcm_buffer.c \
 	$(ENCODER_SRC)
 test_run_encoder_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(ENCODER_CFLAGS)
@@ -1019,6 +1023,7 @@ test_run_convert_SOURCES = test/run_convert.c \
 	src/audio_format.c \
 	src/audio_check.c \
 	src/audio_parser.c \
+	src/pcm_buffer.c \
 	src/pcm_channels.c \
 	src/pcm_format.c \
 	src/pcm_pack.c \
@@ -1069,6 +1074,7 @@ test_run_output_SOURCES = test/run_output.c \
 	src/filter/normalize_filter_plugin.c \
 	src/filter/volume_filter_plugin.c \
 	src/pcm_volume.c \
+	src/pcm_buffer.c \
 	src/AudioCompress/compress.c \
 	src/replay_gain_info.c \
 	src/replay_gain_config.c \
@@ -1087,6 +1093,7 @@ test_read_mixer_SOURCES = test/read_mixer.c \
 	src/filter_plugin.c \
 	src/filter/volume_filter_plugin.c \
 	src/fd_util.c \
+	src/pcm_buffer.c \
 	$(MIXER_SRC)
 
 if ENABLE_BZIP2_TEST
diff --git a/src/pcm_buffer.c b/src/pcm_buffer.c
new file mode 100644
index 000000000..126a4e036
--- /dev/null
+++ b/src/pcm_buffer.c
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "pcm_buffer.h"
+
+void *
+pcm_buffer_get(struct pcm_buffer *buffer, size_t size)
+{
+	if (buffer->size < size) {
+		/* free the old buffer */
+		g_free(buffer->buffer);
+
+		/* allocate a new buffer; align at 8 kB boundaries */
+		buffer->size = ((size - 1) | 0x1fff) + 1;
+		buffer->buffer = g_malloc(buffer->size);
+	}
+
+	return buffer->buffer;
+}
diff --git a/src/pcm_buffer.h b/src/pcm_buffer.h
index 73959ea03..b1c597407 100644
--- a/src/pcm_buffer.h
+++ b/src/pcm_buffer.h
@@ -58,19 +58,8 @@ pcm_buffer_deinit(struct pcm_buffer *buffer)
  * Get the buffer, and guarantee a minimum size.  This buffer becomes
  * invalid with the next pcm_buffer_get() call.
  */
-static inline void *
-pcm_buffer_get(struct pcm_buffer *buffer, size_t size)
-{
-	if (buffer->size < size) {
-		/* free the old buffer */
-		g_free(buffer->buffer);
-
-		/* allocate a new buffer; align at 8 kB boundaries */
-		buffer->size = ((size - 1) | 0x1fff) + 1;
-		buffer->buffer = g_malloc(buffer->size);
-	}
-
-	return buffer->buffer;
-}
+G_GNUC_MALLOC
+void *
+pcm_buffer_get(struct pcm_buffer *buffer, size_t size);
 
 #endif