aboutsummaryrefslogtreecommitdiffstats
path: root/src/command/QueueCommands.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-08-28 12:53:48 +0200
committerMax Kellermann <max@duempel.org>2014-08-28 13:03:18 +0200
commit127fe6ecf001a7bfb7f9a1d704d22c5a866896a5 (patch)
tree4aac35b7687d006999c4e1047da5bfa249f6002b /src/command/QueueCommands.cxx
parent888ab0c89c154b4bb30b626734ce6a14c42a8ed5 (diff)
downloadmpd-127fe6ecf001a7bfb7f9a1d704d22c5a866896a5.tar.gz
mpd-127fe6ecf001a7bfb7f9a1d704d22c5a866896a5.tar.xz
mpd-127fe6ecf001a7bfb7f9a1d704d22c5a866896a5.zip
PlaylistEdit: pass std::chrono::duration to SetSongIdRange()
Diffstat (limited to '')
-rw-r--r--src/command/QueueCommands.cxx22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/command/QueueCommands.cxx b/src/command/QueueCommands.cxx
index c99a6687a..36c8ac84f 100644
--- a/src/command/QueueCommands.cxx
+++ b/src/command/QueueCommands.cxx
@@ -125,7 +125,7 @@ handle_addid(Client &client, unsigned argc, char *argv[])
* integer milliseconds. Omitted values are zero.
*/
static bool
-parse_time_range(const char *p, unsigned &start_ms, unsigned &end_ms)
+parse_time_range(const char *p, SongTime &start_r, SongTime &end_r)
{
char *endptr;
@@ -133,9 +133,9 @@ parse_time_range(const char *p, unsigned &start_ms, unsigned &end_ms)
if (*endptr != ':' || start < 0)
return false;
- start_ms = endptr > p
- ? unsigned(start * 1000u)
- : 0u;
+ start_r = endptr > p
+ ? SongTime::FromS(start)
+ : SongTime::zero();
p = endptr + 1;
@@ -143,11 +143,11 @@ parse_time_range(const char *p, unsigned &start_ms, unsigned &end_ms)
if (*endptr != 0 || end < 0)
return false;
- end_ms = endptr > p
- ? unsigned(end * 1000u)
- : 0u;
+ end_r = endptr > p
+ ? SongTime::FromS(end)
+ : SongTime::zero();
- return end_ms == 0 || end_ms > start_ms;
+ return end_r.IsZero() || end_r > start_r;
}
CommandResult
@@ -157,15 +157,15 @@ handle_rangeid(Client &client, gcc_unused unsigned argc, char *argv[])
if (!check_unsigned(client, &id, argv[1]))
return CommandResult::ERROR;
- unsigned start_ms, end_ms;
- if (!parse_time_range(argv[2], start_ms, end_ms)) {
+ SongTime start, end;
+ if (!parse_time_range(argv[2], start, end)) {
command_error(client, ACK_ERROR_ARG, "Bad range");
return CommandResult::ERROR;
}
Error error;
if (!client.partition.playlist.SetSongIdRange(client.partition.pc,
- id, start_ms, end_ms,
+ id, start, end,
error))
return print_error(client, error);