From 89e18096d95da20a22c3e9423019dd5dd46e9f86 Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Wed, 26 Aug 2009 03:33:31 +0200 Subject: [PATCH] rearrange sequence of arguments to Scroller() --- src/browser.cpp | 2 +- src/helpers.cpp | 6 +++--- src/helpers.h | 4 ++-- src/lyrics.cpp | 2 +- src/playlist.cpp | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/browser.cpp b/src/browser.cpp index 55c87e97..5dac4548 100644 --- a/src/browser.cpp +++ b/src/browser.cpp @@ -88,7 +88,7 @@ void Browser::SwitchTo() std::basic_string Browser::Title() { std::basic_string result = U("Browse: "); - result += Scroller(itsBrowsedDir, COLS-result.length()-(Config.new_design ? 2 : VolumeState.length()), itsScrollBeginning); + result += Scroller(itsBrowsedDir, itsScrollBeginning, w->GetWidth()-result.length()-(Config.new_design ? 2 : VolumeState.length())); return result; } diff --git a/src/helpers.cpp b/src/helpers.cpp index 337ce158..6899ad97 100644 --- a/src/helpers.cpp +++ b/src/helpers.cpp @@ -347,13 +347,13 @@ Buffer ShowTag(const std::string &tag) } #ifdef _UTF8 -std::basic_string Scroller(const std::string &str, size_t width, size_t &pos) +std::basic_string Scroller(const std::string &str, size_t &pos, size_t width) { - return Scroller(TO_WSTRING(str), width, pos); + return Scroller(TO_WSTRING(str), pos, width); } #endif // _UTF8 -std::basic_string Scroller(const std::basic_string &str, size_t width, size_t &pos) +std::basic_string Scroller(const std::basic_string &str, size_t &pos, size_t width) { std::basic_string s(str); if (!Config.header_text_scrolling) diff --git a/src/helpers.h b/src/helpers.h index 1d5d7b67..4f43d28b 100644 --- a/src/helpers.h +++ b/src/helpers.h @@ -116,9 +116,9 @@ std::string ExtractTopDirectory(const std::string &); Buffer ShowTag(const std::string &); #ifdef _UTF8 -std::basic_string Scroller(const std::string &, size_t, size_t &); +std::basic_string Scroller(const std::string &str, size_t &pos, size_t width); #endif // _UTF8 -std::basic_string Scroller(const std::basic_string &, size_t, size_t &); +std::basic_string Scroller(const std::basic_string &str, size_t &pos, size_t width); #ifdef HAVE_CURL_CURL_H size_t write_data(char *, size_t, size_t, void *); diff --git a/src/lyrics.cpp b/src/lyrics.cpp index 9622e74a..3644d596 100644 --- a/src/lyrics.cpp +++ b/src/lyrics.cpp @@ -191,7 +191,7 @@ void Lyrics::SwitchTo() std::basic_string Lyrics::Title() { std::basic_string result = U("Lyrics: "); - result += Scroller(itsSong.toString("{%a - %t}"), COLS-result.length()-(Config.new_design ? 2 : VolumeState.length()), itsScrollBegin); + result += Scroller(itsSong.toString("{%a - %t}"), itsScrollBegin, w->GetWidth()-result.length()-(Config.new_design ? 2 : VolumeState.length())); return result; } diff --git a/src/playlist.cpp b/src/playlist.cpp index ead8dd9d..230ea8e1 100644 --- a/src/playlist.cpp +++ b/src/playlist.cpp @@ -119,7 +119,7 @@ std::basic_string Playlist::Title() std::basic_string result = U("Playlist "); if (ReloadTotalLength || ReloadRemaining) itsBufferedStats = TotalLength(); - result += Scroller(itsBufferedStats, w->GetWidth()-result.length()-(Config.new_design ? 2 : VolumeState.length()), itsScrollBegin); + result += Scroller(itsBufferedStats, itsScrollBegin, w->GetWidth()-result.length()-(Config.new_design ? 2 : VolumeState.length())); return result; }