mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-02-06 03:39:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added shuffle indicator to TransportWindow.

Browse Source
This commit is contained in:
casey 2016-06-26 02:25:56 -07:00
parent c1c29c9757
commit 452ecd7923
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,6 +186,7 @@ TransportWindow::TransportWindow(musik::box::PlaybackService& playback)
this->SetFrameVisible(false);
this->playback.TrackChanged.connect(this, &TransportWindow::OnPlaybackServiceTrackChanged);
this->playback.ModeChanged.connect(this, &TransportWindow::OnPlaybackModeChanged);
this->playback.Shuffled.connect(this, &TransportWindow::OnPlaybackShuffled);
this->transport.VolumeChanged.connect(this, &TransportWindow::OnTransportVolumeChanged);
this->transport.TimeChanged.connect(this, &TransportWindow::OnTransportTimeChanged);
this->paused = false;
@ -225,9 +226,17 @@ void TransportWindow::OnTransportTimeChanged(double time) {
DEBOUNCE_REFRESH(0)
}
void TransportWindow::OnPlaybackShuffled(bool shuffled) {
DEBOUNCE_REFRESH(0);
}
#define ON(w, a) if (a != -1) { wattron(w, a); }
#define OFF(w, a) if (a != -1) { wattroff(w, a); }
void TransportWindow::Update() {
this->Clear();
WINDOW *c = this->GetContent();
size_t cx = (size_t) this->GetContentWidth();
bool paused = (transport.GetPlaybackState() == ITransport::PlaybackPaused);
bool stopped = (transport.GetPlaybackState() == ITransport::PlaybackStopped);
@ -237,9 +246,12 @@ void TransportWindow::Update() {
/* playing SONG TITLE from ALBUM NAME */
std::string duration = "0";
std::string shuffleLabel = " shuffle";
size_t shuffleLabelLen = u8len(shuffleLabel);
if (stopped) {
wattron(c, A_DIM);
wprintw(c, "playback is stopped\n");
wprintw(c, "playback is stopped");
wattroff(c, A_DIM);
}
else {
@ -255,12 +267,20 @@ void TransportWindow::Update() {
album = album.size() ? album : "[album]";
duration = duration.size() ? duration : "0";
size_t written = writePlayingFormat(c, title, album, this->GetContentWidth());
if (written < (size_t) this->GetContentWidth()) {
wprintw(c, "\n");
}
writePlayingFormat(
c,
title,
album,
cx - shuffleLabelLen);
}
wmove(c, 0, cx - shuffleLabelLen);
int64 shuffleAttrs = this->playback.IsShuffled() ? gb : A_DIM;
ON(c, shuffleAttrs);
wprintw(c, shuffleLabel.c_str());
OFF(c, shuffleAttrs);
wmove(c, 1, 0); /* newline */
/* volume slider */

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

@ -64,6 +64,7 @@ namespace musik {
void OnPlaybackModeChanged();
void OnTransportVolumeChanged();
void OnTransportTimeChanged(double time);
void OnPlaybackShuffled(bool shuffled);
bool paused;
musik::core::audio::ITransport& transport;