db/LightSong: use std::chrono::duration for start_ms and end_ms
This commit is contained in:
@@ -23,11 +23,11 @@
|
||||
double
|
||||
LightSong::GetDuration() const
|
||||
{
|
||||
if (end_ms > 0)
|
||||
return (end_ms - start_ms) / 1000.0;
|
||||
if (end_time.IsPositive())
|
||||
return (end_time - start_time).ToDoubleS();
|
||||
|
||||
if (tag->time <= 0)
|
||||
return 0;
|
||||
|
||||
return tag->time - start_ms / 1000.0;
|
||||
return tag->time - start_time.ToDoubleS();
|
||||
}
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
#ifndef MPD_LIGHT_SONG_HXX
|
||||
#define MPD_LIGHT_SONG_HXX
|
||||
|
||||
#include "Chrono.hxx"
|
||||
#include "Compiler.h"
|
||||
|
||||
#include <string>
|
||||
@@ -64,15 +65,15 @@ struct LightSong {
|
||||
time_t mtime;
|
||||
|
||||
/**
|
||||
* Start of this sub-song within the file in milliseconds.
|
||||
* Start of this sub-song within the file.
|
||||
*/
|
||||
unsigned start_ms;
|
||||
SongTime start_time;
|
||||
|
||||
/**
|
||||
* End of this sub-song within the file in milliseconds.
|
||||
* End of this sub-song within the file.
|
||||
* Unused if zero.
|
||||
*/
|
||||
unsigned end_ms;
|
||||
SongTime end_time;
|
||||
|
||||
gcc_pure
|
||||
std::string GetURI() const {
|
||||
|
||||
@@ -192,10 +192,10 @@ ProxySong::ProxySong(const mpd_song *song)
|
||||
mtime = mpd_song_get_last_modified(song);
|
||||
|
||||
#if LIBMPDCLIENT_CHECK_VERSION(2,3,0)
|
||||
start_ms = mpd_song_get_start(song) * 1000;
|
||||
end_ms = mpd_song_get_end(song) * 1000;
|
||||
start_time = SongTime::FromS(mpd_song_get_start(song));
|
||||
end_time = SongTime::FromS(mpd_song_get_end(song));
|
||||
#else
|
||||
start_ms = end_ms = 0;
|
||||
start_time = end_time = SongTime::zero();
|
||||
#endif
|
||||
|
||||
TagBuilder tag_builder;
|
||||
|
||||
@@ -105,7 +105,7 @@ Song::Export() const
|
||||
dest.real_uri = nullptr;
|
||||
dest.tag = &tag;
|
||||
dest.mtime = mtime;
|
||||
dest.start_ms = start_ms;
|
||||
dest.end_ms = end_ms;
|
||||
dest.start_time = SongTime::FromMS(start_ms);
|
||||
dest.end_time = SongTime::FromMS(end_ms);
|
||||
return dest;
|
||||
}
|
||||
|
||||
@@ -66,7 +66,7 @@ public:
|
||||
real_uri = real_uri2.c_str();
|
||||
tag = &tag2;
|
||||
mtime = 0;
|
||||
start_ms = end_ms = 0;
|
||||
start_time = end_time = SongTime::zero();
|
||||
}
|
||||
};
|
||||
|
||||
@@ -360,7 +360,7 @@ visitSong(const UPnPDirObject &meta, const char *path,
|
||||
song.real_uri = meta.url.c_str();
|
||||
song.tag = &meta.tag;
|
||||
song.mtime = 0;
|
||||
song.start_ms = song.end_ms = 0;
|
||||
song.start_time = song.end_time = SongTime::zero();
|
||||
|
||||
return !selection.Match(song) || visit_song(song, error);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user