From 7220617db0b5fad0985eaaebd7f9ced64a0f1adb Mon Sep 17 00:00:00 2001 From: casey Date: Sat, 28 May 2016 02:58:12 -0700 Subject: [PATCH] Default to console layout until we can build a path editor thing --- src/musikbox/Main.cpp | 2 +- src/musikbox/app/window/CommandWindow.cpp | 2 +- src/musikbox/app/window/TransportWindow.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/musikbox/Main.cpp b/src/musikbox/Main.cpp index 7f237b9f5..6e07669aa 100644 --- a/src/musikbox/Main.cpp +++ b/src/musikbox/Main.cpp @@ -201,7 +201,7 @@ int main(int argc, char* argv[]) state.input = NULL; state.keyHandler = NULL; - changeLayout(state, libraryLayout); + changeLayout(state, consoleLayout); while (!quit) { /* if the focused item is an IInput, then get characters from it, diff --git a/src/musikbox/app/window/CommandWindow.cpp b/src/musikbox/app/window/CommandWindow.cpp index 39437b281..b05e33f89 100755 --- a/src/musikbox/app/window/CommandWindow.cpp +++ b/src/musikbox/app/window/CommandWindow.cpp @@ -47,7 +47,7 @@ CommandWindow::CommandWindow( this->bufferPosition = 0; this->output = &output; this->paused = false; - this->output->WriteLine("type 'h' or 'help'\n", BOX_COLOR_BLACK_ON_GREY); + this->Help(); } CommandWindow::~CommandWindow() { diff --git a/src/musikbox/app/window/TransportWindow.cpp b/src/musikbox/app/window/TransportWindow.cpp index 3c5251d4c..e6c373e1d 100755 --- a/src/musikbox/app/window/TransportWindow.cpp +++ b/src/musikbox/app/window/TransportWindow.cpp @@ -56,9 +56,9 @@ void TransportWindow::Show() { } void TransportWindow::ProcessMessage(IMessage &message) { - int type = message.Type(); + int type = message.Type(); - if (type == REFRESH_TRANSPORT_READOUT) { + if (type == REFRESH_TRANSPORT_READOUT) { this->Update(); DEBOUNCE_REFRESH(REFRESH_INTERVAL_MS) } @@ -110,11 +110,11 @@ void TransportWindow::Update() { /* playing SONG TITLE from ALBUM NAME */ std::string duration = "0"; - if (transport->GetPlaybackState() == Transport::PlaybackStopped) { + if (transport->GetPlaybackState() == Transport::PlaybackStopped) { wattron(c, gb); wprintw(c, "playback is stopped"); wattroff(c, gb); - } + } else { std::string title, album;