diff options
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | src/pcm_buffer.c | 35 | ||||
| -rw-r--r-- | src/pcm_buffer.h | 17 |
3 files changed, 43 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index f56b1f9aa..8d30ea655 100644 --- a/Makefile.am +++ b/Makefile.am @@ -369,7 +369,7 @@ endif # PCM library libpcm_a_SOURCES = \ - src/pcm_buffer.h \ + src/pcm_buffer.c src/pcm_buffer.h \ src/pcm_convert.c src/pcm_convert.h \ src/pcm_volume.c src/pcm_volume.h \ src/pcm_mix.c src/pcm_mix.h \ @@ -1014,6 +1014,7 @@ endif test_run_decoder_LDADD = \ $(DECODER_LIBS) \ + libpcm.a \ $(INPUT_LIBS) \ $(ARCHIVE_LIBS) \ $(TAG_LIBS) \ @@ -1033,6 +1034,7 @@ test_run_decoder_SOURCES = test/run_decoder.c \ test_read_tags_LDADD = \ $(DECODER_LIBS) \ + libpcm.a \ $(INPUT_LIBS) \ $(ARCHIVE_LIBS) \ $(TAG_LIBS) \ @@ -1094,6 +1096,7 @@ test_run_encoder_SOURCES = test/run_encoder.c \ src/audio_parser.c test_run_encoder_LDADD = \ $(ENCODER_LIBS) \ + libpcm.a \ $(TAG_LIBS) \ $(GLIB_LIBS) endif @@ -1158,6 +1161,7 @@ test_run_output_SOURCES = test/run_output.c \ src/server_socket.c test_read_mixer_LDADD = \ + libpcm.a \ libmixer_plugins.a \ $(OUTPUT_LIBS) \ $(GLIB_LIBS) diff --git a/src/pcm_buffer.c b/src/pcm_buffer.c new file mode 100644 index 000000000..12d7194a6 --- /dev/null +++ b/src/pcm_buffer.c @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2003-2011 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 1013e87a6..67973b750 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 |