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

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
This commit is contained in:
Eric Wong 2006-07-15 13:42:57 +00:00
parent 563e4c95fd
commit b4df8b8f88
7 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/audio.c
View File

@ -251,7 +251,7 @@ int isCurrentAudioFormat(AudioFormat * audioFormat) {
return 1;
}
inline void syncAudioDevicesEnabledArrays() {
static void syncAudioDevicesEnabledArrays(void) {
int i;
memcpy(myAudioDevicesEnabled, pdAudioDevicesEnabled,AUDIO_MAX_DEVICES);

2
src/audioOutputs/audioOutput_alsa.c
View File

@ -283,7 +283,7 @@ fail:
return -1;
}
inline static int alsa_errorRecovery(AlsaData * ad, int err) {
static int alsa_errorRecovery(AlsaData * ad, int err) {
if(err == -EPIPE) {
DEBUG("Underrun on alsa device \"%s\"\n", ad->device);
}

4
src/dbUtils.c
View File

@ -147,7 +147,7 @@ static int printSongInDirectory(FILE * fp, Song * song, void * data) {
return 0;
}
static inline int strstrSearchTag(Song * song, int type, char * str) {
static int strstrSearchTag(Song * song, int type, char * str) {
int i;
char * dup;
int ret = 0;
@ -224,7 +224,7 @@ int searchForSongsIn(FILE * fp, char * name, int numItems,
return ret;
}
static inline int tagItemFoundAndMatches(Song * song, int type, char * str) {
static int tagItemFoundAndMatches(Song * song, int type, char * str) {
int i;
if(type == LOCATE_TAG_FILE_TYPE) {

1
src/inputPlugins/_flac_common.h
View File

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

3
src/inputPlugins/mpc_plugin.c
View File

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

2
src/inputPlugins/oggvorbis_plugin.c
View File

@ -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) == '=') {

2
src/tag.c
View File

@ -560,7 +560,7 @@ int mpdTagsAreEqual(MpdTag * tag1, MpdTag * tag2) {
} \
}
inline static void appendToTagItems(MpdTag * tag, int type, char * value,
static void appendToTagItems(MpdTag * tag, int type, char * value,
int len)
{
int i = tag->numOfItems;