diff options
author | Andrzej Rybczak <electricityispower@gmail.com> | 2012-09-13 19:23:33 +0200 |
---|---|---|
committer | Andrzej Rybczak <electricityispower@gmail.com> | 2012-09-13 19:23:33 +0200 |
commit | dd7665bb7d66420b95784a882a5fd8c5199a1cd3 (patch) | |
tree | c225e765c3e6c98b047f56b88d512110ceda32eb /src/lyrics.cpp | |
parent | 8e6d9a97e3b21c0fc08fbc2bd9aae84420c7d149 (diff) |
more PascalCase to camelCase conversions
Diffstat (limited to 'src/lyrics.cpp')
-rw-r--r-- | src/lyrics.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/lyrics.cpp b/src/lyrics.cpp index f222910a..1a4898ec 100644 --- a/src/lyrics.cpp +++ b/src/lyrics.cpp @@ -50,22 +50,22 @@ size_t Lyrics::itsWorkersNumber = 0; Lyrics *myLyrics = new Lyrics; -void Lyrics::Init() +void Lyrics::init() { w = new NC::Scrollpad(0, MainStartY, COLS, MainHeight, "", Config.main_color, NC::brNone); isInitialized = 1; } -void Lyrics::Resize() +void Lyrics::resize() { size_t x_offset, width; - GetWindowResizeParams(x_offset, width); + getWindowResizeParams(x_offset, width); w->resize(width, MainHeight); w->moveTo(x_offset, MainStartY); hasToBeResized = 0; } -void Lyrics::Update() +void Lyrics::update() { # ifdef HAVE_CURL_CURL_H if (isReadyToTake) @@ -91,19 +91,19 @@ void Lyrics::Update() } } -void Lyrics::SwitchTo() +void Lyrics::switchTo() { using Global::myLockedScreen; using Global::myInactiveScreen; if (myScreen == this) - return myOldScreen->SwitchTo(); + return myOldScreen->switchTo(); if (!isInitialized) - Init(); + init(); if (hasToBeResized) - Resize(); + resize(); itsScrollBegin = 0; @@ -144,19 +144,19 @@ void Lyrics::SwitchTo() // to adjust screen size then. if (myLockedScreen) // BUG { - UpdateInactiveScreen(this); - Resize(); + updateInactiveScreen(this); + resize(); } } -std::wstring Lyrics::Title() +std::wstring Lyrics::title() { std::wstring result = L"Lyrics: "; result += Scroller(ToWString(itsSong.toString("{%a - %t}", ", ")), itsScrollBegin, COLS-result.length()-(Config.new_design ? 2 : Global::VolumeState.length())); return result; } -void Lyrics::SpacePressed() +void Lyrics::spacePressed() { Config.now_playing_lyrics = !Config.now_playing_lyrics; Statusbar::msg("Reload lyrics if song changes: %s", Config.now_playing_lyrics ? "On" : "Off"); |