diff options
| author | Eric Wong <normalperson@yhbt.net> | 2006-07-15 13:42:57 +0000 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2006-07-15 13:42:57 +0000 |
| commit | b4df8b8f880648e63781395e1a350f258b809a18 (patch) | |
| tree | 3e26b8faf86cf68f35506eb3e59b73d9477211e7 /src/inputPlugins | |
| parent | 563e4c95fdea05dc162442d6b3a66e3fa0a13a48 (diff) | |
| download | mpd-b4df8b8f880648e63781395e1a350f258b809a18.tar.gz mpd-b4df8b8f880648e63781395e1a350f258b809a18.tar.xz mpd-b4df8b8f880648e63781395e1a350f258b809a18.zip | |
De-inline non-trivial, non-performance-critical functions
Functions that should stay inlined should have an explanation
attached to them.
git-svn-id: https://svn.musicpd.org/mpd/trunk@4355 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/inputPlugins')
| -rw-r--r-- | src/inputPlugins/_flac_common.h | 1 | ||||
| -rw-r--r-- | src/inputPlugins/mpc_plugin.c | 3 | ||||
| -rw-r--r-- | src/inputPlugins/oggvorbis_plugin.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/inputPlugins/_flac_common.h b/src/inputPlugins/_flac_common.h index 88fa4da58..2834d3524 100644 --- a/src/inputPlugins/_flac_common.h +++ b/src/inputPlugins/_flac_common.h @@ -60,6 +60,7 @@ void flac_error_common_cb( const char * plugin, MpdTag * copyVorbisCommentBlockToMpdTag(const FLAC__StreamMetadata * block, MpdTag * tag); +/* keep this inlined, this is just macro but prettier :) */ static inline int flacSendChunk(FlacData * data) { if (sendDataToOutputBuffer(data->cb, NULL, data->dc, 1, data->chunk, diff --git a/src/inputPlugins/mpc_plugin.c b/src/inputPlugins/mpc_plugin.c index 30878fc16..253ed0891 100644 --- a/src/inputPlugins/mpc_plugin.c +++ b/src/inputPlugins/mpc_plugin.c @@ -82,7 +82,8 @@ static mpc_int32_t mpc_getsize_cb(void * vdata) { return data->inStream->size; } -inline mpd_sint16 convertSample(MPC_SAMPLE_FORMAT sample) { +/* this _looks_ performance-critical, don't de-inline -- eric */ +static inline mpd_sint16 convertSample(MPC_SAMPLE_FORMAT sample) { /* only doing 16-bit audio for now */ mpd_sint32 val; diff --git a/src/inputPlugins/oggvorbis_plugin.c b/src/inputPlugins/oggvorbis_plugin.c index 30034af69..3c699cef2 100644 --- a/src/inputPlugins/oggvorbis_plugin.c +++ b/src/inputPlugins/oggvorbis_plugin.c @@ -103,7 +103,7 @@ long ogg_tell_cb(void * vdata) { return (long)(data->inStream->offset); } -static inline char * ogg_parseComment(char * comment, char * needle) { +static char * ogg_parseComment(char * comment, char * needle) { int len = strlen(needle); if(strncasecmp(comment, needle, len) == 0 && *(comment+len) == '=') { |