Fix conflict

This commit is contained in:
Sebastian-byte
2021-07-23 16:34:31 -05:00
39 changed files with 263 additions and 42 deletions

View File

@@ -87,6 +87,7 @@ public:
void setRunning(bool running);
bool isRunning() const;
int64_t totalTimePlayed() const;
int64_t lastTimePlayed() const;
void resetTimePlayed();
/// get the type of this instance