mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-01-29 12:32:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'trofi/master' into clangen/contributions-03-12-2022

Browse Source
This commit is contained in:
casey langen 2022-03-12 13:30:50 -08:00
commit 0199dba00e
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/musikcube/app/window/TransportWindow.cpp
View File

@ -363,7 +363,7 @@ size_t TransportWindow::WritePlayingFormat(WINDOW *w, size_t width) {
metadataFieldToPosition[token->value] = Position(x, y, cols);
ON(w, attr);
checked_wprintw(w, value.c_str());
checked_wprintw(w, "%s", value.c_str());
OFF(w, attr);
remaining -= cols;
@ -678,7 +678,7 @@ void TransportWindow::Update(TimeMode timeMode) {
if (stopped && !this->buffering) {
ON(c, disabled);
checked_wprintw(c, Strings.STOPPED.c_str());
checked_wprintw(c, "%s", Strings.STOPPED.c_str());
displayCache.Reset();
OFF(c, disabled);
}
@ -692,7 +692,7 @@ void TransportWindow::Update(TimeMode timeMode) {
wmove(c, 0, shuffleOffset);
Color const shuffleAttrs = this->playback.IsShuffled() ? gb : disabled;
ON(c, shuffleAttrs);
checked_wprintw(c, shuffleLabel.c_str());
checked_wprintw(c, "%s", shuffleLabel.c_str());
OFF(c, shuffleAttrs);
this->shufflePos.Set(shuffleOffset, narrow_cast<int>(shuffleWidth));
@ -811,7 +811,7 @@ void TransportWindow::Update(TimeMode timeMode) {
wmove(c, 1, 0); /* move cursor to the second line */
ON(c, volumeAttrs);
checked_wprintw(c, volume.c_str());
checked_wprintw(c, "%s", volume.c_str());
OFF(c, volumeAttrs);
if (replayGainEnabled) {
@ -834,7 +834,7 @@ void TransportWindow::Update(TimeMode timeMode) {
ON(c, repeatAttrs);
this->repeatPos.Set(getcurx(c), narrow_cast<int>(u8cols(repeatModeLabel)));
checked_wprintw(c, repeatModeLabel.c_str());
checked_wprintw(c, "%s", repeatModeLabel.c_str());
OFF(c, repeatAttrs);
this->Invalidate();

4
src/musikcube/cursespp/DialogOverlay.cpp
View File

@ -226,7 +226,7 @@ void DialogOverlay::OnRedraw() {
if (this->title.size()) {
wmove(c, currentY, currentX);
wattron(c, A_BOLD);
checked_wprintw(c, text::Ellipsize(this->title, this->width - 4).c_str());
checked_wprintw(c, "%s", text::Ellipsize(this->title, this->width - 4).c_str());
wattroff(c, A_BOLD);
currentY += 2;
}
@ -234,7 +234,7 @@ void DialogOverlay::OnRedraw() {
if (this->message.size()) {
for (size_t i = 0; i < messageLines.size(); i++) {
wmove(c, currentY, currentX);
checked_wprintw(c, this->messageLines.at(i).c_str());
checked_wprintw(c, "%s", this->messageLines.at(i).c_str());
++currentY;
}
}

2
src/musikcube/cursespp/InputOverlay.cpp
View File

@ -203,7 +203,7 @@ void InputOverlay::OnRedraw() {
if (this->title.size()) {
wmove(c, 0, 1);
wattron(c, A_BOLD);
checked_wprintw(c, text::Align(this->title, text::AlignCenter, this->width - 4).c_str());
checked_wprintw(c, "%s", text::Align(this->title, text::AlignCenter, this->width - 4).c_str());
wattroff(c, A_BOLD);
}
}

2
src/musikcube/cursespp/ListOverlay.cpp
View File

@ -328,7 +328,7 @@ void ListOverlay::UpdateContents() {
if (this->title.size()) {
wmove(c, currentY, currentX);
wattron(c, A_BOLD);
checked_wprintw(c, text::Align(this->title, text::AlignCenter, this->width - 4).c_str());
checked_wprintw(c, "%s", text::Align(this->title, text::AlignCenter, this->width - 4).c_str());
wattroff(c, A_BOLD);
currentY += 2;
}

4
src/musikcube/cursespp/ShortcutsWindow.cpp
View File

@ -236,7 +236,7 @@ void ShortcutsWindow::OnRedraw() {
}
wattron(c, keyAttrs);
checked_wprintw(c, key.c_str());
checked_wprintw(c, "%s", key.c_str());
wattroff(c, keyAttrs);
remaining -= len;
@ -252,7 +252,7 @@ void ShortcutsWindow::OnRedraw() {
len = remaining;
}
checked_wprintw(c, value.c_str());
checked_wprintw(c, "%s", value.c_str());
remaining -= len;
}
}

2
src/musikcube/cursespp/ToastOverlay.cpp
View File

@ -115,6 +115,6 @@ void ToastOverlay::OnRedraw() {
for (int i = 0; i < (int) this->titleLines.size(); i++) {
wmove(c, i, 1);
checked_wprintw(c, text::Ellipsize(this->titleLines[i], this->width - 4).c_str());
checked_wprintw(c, "%s", text::Ellipsize(this->titleLines[i], this->width - 4).c_str());
}
}