Skip to content

M
mpd
Commit 1ff2d5b6 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

playlist_state: simplify printf() calls

Let the C compiler concatenate string constants.
parent e4b7a113
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 22 deletions
src/playlist_state.c
View file @ 1ff2d5b6
...@@ -58,47 +58,43 @@ playlist_state_save(FILE *fp, const struct playlist *playlist) ...@@ -58,47 +58,43 @@ playlist_state_save(FILE *fp, const struct playlist *playlist)
pc_get_status(&player_status); pc_get_status(&player_status);
fprintf(fp, "%s", PLAYLIST_STATE_FILE_STATE); fputs(PLAYLIST_STATE_FILE_STATE "\n", fp);
if (playlist->playing) { if (playlist->playing) {
switch (player_status.state) { switch (player_status.state) {
case PLAYER_STATE_PAUSE: case PLAYER_STATE_PAUSE:
fprintf(fp, "%s\n", PLAYLIST_STATE_FILE_STATE_PAUSE); fputs(PLAYLIST_STATE_FILE_STATE_PAUSE "\n", fp);
break; break;
default: default:
fprintf(fp, "%s\n", PLAYLIST_STATE_FILE_STATE_PLAY); fputs(PLAYLIST_STATE_FILE_STATE_PLAY "\n", fp);
} }
fprintf(fp, "%s%i\n", PLAYLIST_STATE_FILE_CURRENT, fprintf(fp, PLAYLIST_STATE_FILE_CURRENT "%i\n",
queue_order_to_position(&playlist->queue, queue_order_to_position(&playlist->queue,
playlist->current)); playlist->current));
fprintf(fp, "%s%i\n", PLAYLIST_STATE_FILE_TIME, fprintf(fp, PLAYLIST_STATE_FILE_TIME "%i\n",
(int)player_status.elapsed_time); (int)player_status.elapsed_time);
} else { } else {
fprintf(fp, "%s\n", PLAYLIST_STATE_FILE_STATE_STOP); fputs(PLAYLIST_STATE_FILE_STATE_STOP "\n", fp);
if (playlist->current >= 0) if (playlist->current >= 0)
fprintf(fp, "%s%i\n", PLAYLIST_STATE_FILE_CURRENT, fprintf(fp, PLAYLIST_STATE_FILE_CURRENT "%i\n",
queue_order_to_position(&playlist->queue, queue_order_to_position(&playlist->queue,
playlist->current)); playlist->current));
} }
fprintf(fp, "%s%i\n", PLAYLIST_STATE_FILE_RANDOM, fprintf(fp, PLAYLIST_STATE_FILE_RANDOM "%i\n", playlist->queue.random);
playlist->queue.random); fprintf(fp, PLAYLIST_STATE_FILE_REPEAT "%i\n", playlist->queue.repeat);
fprintf(fp, "%s%i\n", PLAYLIST_STATE_FILE_REPEAT, fprintf(fp, PLAYLIST_STATE_FILE_SINGLE "%i\n", playlist->queue.single);
playlist->queue.repeat); fprintf(fp, PLAYLIST_STATE_FILE_CONSUME "%i\n",
fprintf(fp, "%s%i\n", PLAYLIST_STATE_FILE_SINGLE,
playlist->queue.single);
fprintf(fp, "%s%i\n", PLAYLIST_STATE_FILE_CONSUME,
playlist->queue.consume); playlist->queue.consume);
fprintf(fp, "%s%i\n", PLAYLIST_STATE_FILE_CROSSFADE, fprintf(fp, PLAYLIST_STATE_FILE_CROSSFADE "%i\n",
(int)(pc_get_cross_fade())); (int)(pc_get_cross_fade()));
fprintf(fp, "%s%f\n", PLAYLIST_STATE_FILE_MIXRAMPDB, fprintf(fp, PLAYLIST_STATE_FILE_MIXRAMPDB "%f\n", pc_get_mixramp_db());
pc_get_mixramp_db()); fprintf(fp, PLAYLIST_STATE_FILE_MIXRAMPDELAY "%f\n",
fprintf(fp, "%s%f\n", PLAYLIST_STATE_FILE_MIXRAMPDELAY,
pc_get_mixramp_delay()); pc_get_mixramp_delay());
fprintf(fp, "%s\n", PLAYLIST_STATE_FILE_PLAYLIST_BEGIN); fputs(PLAYLIST_STATE_FILE_PLAYLIST_BEGIN "\n", fp);
queue_save(fp, &playlist->queue); queue_save(fp, &playlist->queue);
fprintf(fp, "%s\n", PLAYLIST_STATE_FILE_PLAYLIST_END); fputs(PLAYLIST_STATE_FILE_PLAYLIST_END "\n", fp);
} }
static void static void
...@@ -117,8 +113,8 @@ playlist_state_load(FILE *fp, struct playlist *playlist, char *buffer) ...@@ -117,8 +113,8 @@ playlist_state_load(FILE *fp, struct playlist *playlist, char *buffer)
song = queue_load_song(&playlist->queue, buffer); song = queue_load_song(&playlist->queue, buffer);
if (!fgets(buffer, PLAYLIST_BUFFER_SIZE, fp)) { if (!fgets(buffer, PLAYLIST_BUFFER_SIZE, fp)) {
g_warning("'%s' not found in state file", g_warning("'" PLAYLIST_STATE_FILE_PLAYLIST_END
PLAYLIST_STATE_FILE_PLAYLIST_END); "' not found in state file");
break; break;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment