oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

pcm_buffer: un-inline pcm_buffer_get() 

This function is too complex for being inlined everywhere.
This commit is contained in:
Max Kellermann 2011-10-10 08:17:39 +02:00
parent 52b77f6e31
commit c9a57d354d
3 changed files with 43 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -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)

35
src/pcm_buffer.c Normal file
View File

@ -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;
}

17
src/pcm_buffer.h
View File

@ -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