mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-12-28 15:16:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added a simple smoothing function to TransportWindow's current time

Browse Source 
display.
This commit is contained in:
casey 2016-06-30 16:44:47 -07:00
parent 8c82089c59
commit 713bf0d646
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/musikbox/app/window/TransportWindow.cpp
View File

@ -62,7 +62,7 @@ using namespace boost::chrono;
using namespace cursespp;
#define REFRESH_TRANSPORT_READOUT 1001
#define REFRESH_INTERVAL_MS 500
#define REFRESH_INTERVAL_MS 1000
#define DEBOUNCE_REFRESH(x) \
this->RemoveMessage(REFRESH_TRANSPORT_READOUT); \
@ -190,6 +190,7 @@ TransportWindow::TransportWindow(musik::box::PlaybackService& playback)
this->transport.VolumeChanged.connect(this, &TransportWindow::OnTransportVolumeChanged);
this->transport.TimeChanged.connect(this, &TransportWindow::OnTransportTimeChanged);
this->paused = false;
this->lastTime = 0.0f;
}
TransportWindow::~TransportWindow() {
@ -232,6 +233,7 @@ void TransportWindow::OnPlaybackShuffled(bool shuffled) {
#define ON(w, a) if (a != -1) { wattron(w, a); }
#define OFF(w, a) if (a != -1) { wattroff(w, a); }
#define TIME_SLOP 3.0f
void TransportWindow::Update() {
this->Clear();
@ -243,12 +245,15 @@ void TransportWindow::Update() {
int64 gb = COLOR_PAIR(CURSESPP_GREEN_ON_TRANSPARENT);
/* playing SONG TITLE from ALBUM NAME */
std::string duration = "0";
/* prepare the "shuffle" label */
std::string shuffleLabel = " shuffle";
size_t shuffleLabelLen = u8len(shuffleLabel);
/* playing SONG TITLE from ALBUM NAME */
std::string duration = "0";
if (stopped) {
wattron(c, A_DIM);
wprintw(c, "playback is stopped");
@ -280,7 +285,7 @@ void TransportWindow::Update() {
wprintw(c, shuffleLabel.c_str());
OFF(c, shuffleAttrs);
wmove(c, 1, 0); /* newline */
wmove(c, 1, 0); /* move cursor to the second line */
/* volume slider */
@ -298,6 +303,7 @@ void TransportWindow::Update() {
wprintw(c, volume.c_str());
/* repeat mode setup */
PlaybackService::RepeatMode mode = this->playback.GetRepeatMode();
std::string repeatLabel = " ∞ ";
std::string repeatModeLabel;
@ -332,7 +338,22 @@ void TransportWindow::Update() {
transport.Position();
int secondsCurrent = (int) round(transport.Position());
/* calculating playback time is inexact because it's based on buffers that
are sent to the output. here we use a simple smoothing function to hopefully
mitigate jumping around. basically: draw the time as one second more than the
last time we displayed, unless they are more than a second apart. note this
only works if REFRESH_INTERVAL_MS is 1000. */
double smoothedTime = this->lastTime += 1.0f;
double actualTime = transport.Position();
if (paused || stopped || fabs(smoothedTime - actualTime) > TIME_SLOP) {
smoothedTime = actualTime;
}
this->lastTime = smoothedTime;
/* end time smoothing */
int secondsCurrent = (int) round(smoothedTime);
int secondsTotal = boost::lexical_cast<int>(duration);
std::string currentTime = duration::Duration(std::min(secondsCurrent, secondsTotal));

1
src/musikbox/app/window/TransportWindow.h
View File

@ -70,6 +70,7 @@ namespace musik {
musik::core::audio::ITransport& transport;
musik::box::PlaybackService& playback;
musik::core::TrackPtr currentTrack;
double lastTime;
};
}
}