summaryrefslogtreecommitdiff
path: root/src/lyrics.cpp
diff options
context:
space:
mode:
authorAndrzej Rybczak <electricityispower@gmail.com>2012-09-03 15:34:07 +0200
committerAndrzej Rybczak <electricityispower@gmail.com>2012-09-03 15:34:07 +0200
commitaf2cdca3d0bd2966e937519aa015fcc1ab58c723 (patch)
tree8147b1adb282de85a1ed13a919cb1ee2b1843822 /src/lyrics.cpp
parent6f918091d99bdb3759017413c9efeb17b4dc3927 (diff)
change naming conventions in NC namespace
Diffstat (limited to 'src/lyrics.cpp')
-rw-r--r--src/lyrics.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/lyrics.cpp b/src/lyrics.cpp
index 5d85bb17..461d4ba6 100644
--- a/src/lyrics.cpp
+++ b/src/lyrics.cpp
@@ -58,8 +58,8 @@ void Lyrics::Resize()
{
size_t x_offset, width;
GetWindowResizeParams(x_offset, width);
- w->Resize(width, MainHeight);
- w->MoveTo(x_offset, MainStartY);
+ w->resize(width, MainHeight);
+ w->moveTo(x_offset, MainStartY);
hasToBeResized = 0;
}
@@ -71,8 +71,8 @@ void Lyrics::Update()
if (isDownloadInProgress)
{
- w->Flush();
- w->Refresh();
+ w->flush();
+ w->refresh();
}
# endif // HAVE_CURL_CURL_H
if (ReloadNP)
@@ -268,7 +268,7 @@ void *Lyrics::Download()
Save(itsFilename, result.second);
utf_to_locale(result.second);
- w->Clear();
+ w->clear();
*w << result.second;
}
else
@@ -331,8 +331,8 @@ void Lyrics::Load()
CreateDir(Config.lyrics_directory);
- w->Clear();
- w->Reset();
+ w->clear();
+ w->reset();
std::ifstream input(itsFilename.c_str());
if (input.is_open())
@@ -347,9 +347,9 @@ void Lyrics::Load()
*w << line;
first = 0;
}
- w->Flush();
+ w->flush();
if (ReloadNP)
- w->Refresh();
+ w->refresh();
}
else
{
@@ -358,7 +358,7 @@ void Lyrics::Load()
isDownloadInProgress = 1;
# else
*w << U("Local lyrics not found. As ncmpcpp has been compiled without curl support, you can put appropriate lyrics into ") << TO_WSTRING(Config.lyrics_directory) << U(" directory (file syntax is \"$ARTIST - $TITLE.txt\") or recompile ncmpcpp with curl support.");
- w->Flush();
+ w->flush();
# endif
}
}
@@ -428,8 +428,8 @@ void Lyrics::Take()
{
assert(isReadyToTake);
pthread_join(itsDownloader, 0);
- w->Flush();
- w->Refresh();
+ w->flush();
+ w->refresh();
isDownloadInProgress = 0;
isReadyToTake = 0;
}