summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLouis Burda <quent.burda@gmail.com>2023-02-19 14:35:16 +0100
committerLouis Burda <quent.burda@gmail.com>2023-02-19 14:35:16 +0100
commit2ae8c06105a9323d6e3869b7ec01fd73c9bb148e (patch)
tree902a71505896bd682c72dc072907453f8470dd90 /src
parent3596777343e23033eea9cdd618adeb7871a6c708 (diff)
downloadtmus-2ae8c06105a9323d6e3869b7ec01fd73c9bb148e.tar.gz
tmus-2ae8c06105a9323d6e3869b7ec01fd73c9bb148e.zip
Fix mplay +EXIT messages displayed as status
Diffstat (limited to 'src')
-rw-r--r--src/player_mplay.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/player_mplay.c b/src/player_mplay.c
index aba0766..0cdc45a 100644
--- a/src/player_mplay.c
+++ b/src/player_mplay.c
@@ -188,7 +188,9 @@ player_update(void)
fprintf(mplay.stdin, "status\n");
line = mplay_readline();
if (!line || strncmp(line, "+STATUS:", 8)) {
- MPLAY_STATUS(line);
+ mplay_kill();
+ if (!line || strncmp(line, "+EXIT:", 6))
+ MPLAY_STATUS(line);
return;
}
@@ -248,6 +250,7 @@ player_toggle_pause(void)
fprintf(mplay.stdin, "pause\n");
line = mplay_readline();
if (!line || strncmp(line, "+PAUSE:", 7)) {
+ mplay_kill();
MPLAY_STATUS(line);
return PLAYER_ERR;
}
@@ -295,6 +298,9 @@ player_seek(int sec)
fprintf(mplay.stdin, "seek %i\n", sec);
line = mplay_readline();
if (!line || strncmp(line, "+SEEK:", 6)) {
+ mplay_kill();
+ if (line && !strncmp(line, "+EXIT:", 6))
+ return PLAYER_OK;
MPLAY_STATUS(line);
return PLAYER_ERR;
}
@@ -318,6 +324,7 @@ player_set_volume(unsigned int vol)
fprintf(mplay.stdin, "vol %i\n", vol);
line = mplay_readline();
if (!line || strncmp(line, "+VOLUME:", 8)) {
+ mplay_kill();
MPLAY_STATUS(line);
return PLAYER_ERR;
}