diff --git a/src/driver/lcd4l.cpp b/src/driver/lcd4l.cpp index 989c7c434..eba627c61 100644 --- a/src/driver/lcd4l.cpp +++ b/src/driver/lcd4l.cpp @@ -974,7 +974,11 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun) done = 0; todo = cur_duration / 60; } - snprintf(Duration, sizeof(Duration), "%d/%d", done, total); + snprintf(Duration, sizeof(Duration), "%d/%d\n%d\n%d\n%d", + done, total, + done, + todo, + total); } tm_struct = localtime(&cur_start_time); @@ -1014,11 +1018,17 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun) time_t total = meta.total_time; time_t done = CAudioPlayer::getInstance()->getTimePlayed(); + time_t todo = total - done; if ((total > 0) && (done > 0)) { Progress = 100 * done / total; - snprintf(Duration, sizeof(Duration), "%ld:%02ld/%ld:%02ld", done / 60, done % 60, total / 60, total % 60); + + snprintf(Duration, sizeof(Duration), "%ld:%02ld/%ld:%02ld\n%ld:%02ld\n%ld:%02ld\n%ld:%02ld", + done / 60, done % 60, total / 60, total % 60, + done / 60, done % 60, + todo / 60, todo % 60, + total / 60, total % 60); } } @@ -1054,10 +1064,16 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun) if (!ModeTshift) { + Progress = CMoviePlayerGui::getInstance().file_prozent; + int total = CMoviePlayerGui::getInstance().GetDuration(); int done = CMoviePlayerGui::getInstance().GetPosition(); - snprintf(Duration, sizeof(Duration), "%d/%d", done / (60 * 1000), total / (60 * 1000)); - Progress = CMoviePlayerGui::getInstance().file_prozent; + int todo = total - done; + snprintf(Duration, sizeof(Duration), "%d/%d\n%d\n%d\n%d", + done / (60 * 1000), total / (60 * 1000), + done / (60 * 1000), + todo / (60 * 1000), + total / (60 * 1000)); } time_t sTime = time(NULL); diff --git a/src/driver/lcd4l.h b/src/driver/lcd4l.h index f8d1cf37c..f6e7908b0 100644 --- a/src/driver/lcd4l.h +++ b/src/driver/lcd4l.h @@ -146,7 +146,7 @@ class CLCD4l std::string m_Info1; std::string m_Info2; int m_Progress; - char m_Duration[24]; + char m_Duration[128]; std::string m_Start; std::string m_End;