aboutsummaryrefslogtreecommitdiffstats
path: root/src/playlist.c
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2006-07-30 23:32:39 +0000
committerEric Wong <normalperson@yhbt.net>2006-07-30 23:32:39 +0000
commit381d7232a0d63c0a145fae5e2c40e577ff2f44f1 (patch)
tree6a9191774f3c797a77ef7d85dbe71564ff252ada /src/playlist.c
parent71fe871908db4317e5afd4308a044909a1799c9e (diff)
downloadmpd-381d7232a0d63c0a145fae5e2c40e577ff2f44f1.tar.gz
mpd-381d7232a0d63c0a145fae5e2c40e577ff2f44f1.tar.xz
mpd-381d7232a0d63c0a145fae5e2c40e577ff2f44f1.zip
remove deprecated myfprintf wrapper
This shaves another 5-6k because we've removed the paranoid fflush() calls after every fprintf. Now we only fflush() when we need to git-svn-id: https://svn.musicpd.org/mpd/trunk@4493 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rw-r--r--src/playlist.c27
1 files changed, 14 insertions, 13 deletions
diff --git a/src/playlist.c b/src/playlist.c
index 374de976b..64350d471 100644
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -270,36 +270,37 @@ void savePlaylistState(void)
return;
}
- myfprintf(fp, "%s", PLAYLIST_STATE_FILE_STATE);
+ fprintf(fp, "%s", PLAYLIST_STATE_FILE_STATE);
switch (playlist_state) {
case PLAYLIST_STATE_PLAY:
switch (getPlayerState()) {
case PLAYER_STATE_PAUSE:
- myfprintf(fp, "%s\n",
+ fprintf(fp, "%s\n",
PLAYLIST_STATE_FILE_STATE_PAUSE);
break;
default:
- myfprintf(fp, "%s\n",
+ fprintf(fp, "%s\n",
PLAYLIST_STATE_FILE_STATE_PLAY);
}
- myfprintf(fp, "%s%i\n", PLAYLIST_STATE_FILE_CURRENT,
+ fprintf(fp, "%s%i\n", PLAYLIST_STATE_FILE_CURRENT,
playlist.order[playlist.current]);
- myfprintf(fp, "%s%i\n", PLAYLIST_STATE_FILE_TIME,
+ fprintf(fp, "%s%i\n", PLAYLIST_STATE_FILE_TIME,
getPlayerElapsedTime());
break;
default:
- myfprintf(fp, "%s\n", PLAYLIST_STATE_FILE_STATE_STOP);
+ fprintf(fp, "%s\n", PLAYLIST_STATE_FILE_STATE_STOP);
break;
}
- myfprintf(fp, "%s%i\n", PLAYLIST_STATE_FILE_RANDOM,
+ fprintf(fp, "%s%i\n", PLAYLIST_STATE_FILE_RANDOM,
playlist.random);
- myfprintf(fp, "%s%i\n", PLAYLIST_STATE_FILE_REPEAT,
+ fprintf(fp, "%s%i\n", PLAYLIST_STATE_FILE_REPEAT,
playlist.repeat);
- myfprintf(fp, "%s%i\n", PLAYLIST_STATE_FILE_CROSSFADE,
+ fprintf(fp, "%s%i\n", PLAYLIST_STATE_FILE_CROSSFADE,
(int)(getPlayerCrossFade()));
- myfprintf(fp, "%s\n", PLAYLIST_STATE_FILE_PLAYLIST_BEGIN);
+ fprintf(fp, "%s\n", PLAYLIST_STATE_FILE_PLAYLIST_BEGIN);
+ fflush(fp);
showPlaylist(fileno(fp));
- myfprintf(fp, "%s\n", PLAYLIST_STATE_FILE_PLAYLIST_END);
+ fprintf(fp, "%s\n", PLAYLIST_STATE_FILE_PLAYLIST_END);
while (fclose(fp) && errno == EINTR) ;
}
@@ -1414,12 +1415,12 @@ int savePlaylist(int fd, char *utf8file)
for (i = 0; i < playlist.length; i++) {
if (playlist_saveAbsolutePaths &&
playlist.songs[i]->type == SONG_TYPE_FILE) {
- myfprintf(fileP, "%s\n",
+ fprintf(fileP, "%s\n",
rmp2amp(utf8ToFsCharset
((getSongUrl(playlist.songs[i])))));
} else {
url = utf8ToFsCharset(getSongUrl(playlist.songs[i]));
- myfprintf(fileP, "%s\n", url);
+ fprintf(fileP, "%s\n", url);
free(url);
}