Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make Lyrics::FilenamePath non-static member

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-03-27 14:17:37 +01:00
parent db0b42b5da
commit d5a63d6b61
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/lyrics.cpp
View File

@@ -60,8 +60,6 @@ bool Lyrics::Reload = 0;
bool Lyrics::Ready = 0; bool Lyrics::Ready = 0;
#endif // HAVE_CURL_CURL_H #endif // HAVE_CURL_CURL_H
std::string Lyrics::FilenamePath;
#ifdef HAVE_PTHREAD_H #ifdef HAVE_PTHREAD_H
pthread_t *Lyrics::Downloader = 0; pthread_t *Lyrics::Downloader = 0;
pthread_mutex_t Global::CurlLock = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_t Global::CurlLock = PTHREAD_MUTEX_INITIALIZER;
@@ -148,7 +146,7 @@ void Lyrics::SwitchTo()
{ {
string file = locale_to_utf_cpy(itsSong.GetArtist()) + " - " + locale_to_utf_cpy(itsSong.GetTitle()) + ".txt"; string file = locale_to_utf_cpy(itsSong.GetArtist()) + " - " + locale_to_utf_cpy(itsSong.GetTitle()) + ".txt";
EscapeUnallowedChars(file); EscapeUnallowedChars(file);
FilenamePath = Folder + "/" + file; itsFilenamePath = Folder + "/" + file;
mkdir(Folder.c_str() mkdir(Folder.c_str()
# ifndef WIN32 # ifndef WIN32
@@ -156,7 +154,7 @@ void Lyrics::SwitchTo()
# endif // !WIN32 # endif // !WIN32
); );
std::ifstream input(FilenamePath.c_str()); std::ifstream input(itsFilenamePath.c_str());
if (input.is_open()) if (input.is_open())
{ {
bool first = 1; bool first = 1;
@@ -264,7 +262,7 @@ void *Lyrics::Get(void *screen_void_ptr)
*screen->w << utf_to_locale_cpy(result); *screen->w << utf_to_locale_cpy(result);
std::ofstream output(FilenamePath.c_str()); std::ofstream output(screen->itsFilenamePath.c_str());
if (output.is_open()) if (output.is_open())
{ {
output << result; output << result;
@@ -290,7 +288,7 @@ void Lyrics::Edit()
if (Config.use_console_editor) if (Config.use_console_editor)
{ {
system(("/bin/sh -c \"" + Config.external_editor + " \\\"" + FilenamePath + "\\\"\"").c_str()); system(("/bin/sh -c \"" + Config.external_editor + " \\\"" + itsFilenamePath + "\\\"\"").c_str());
// below is needed as screen gets cleared, but apparently // below is needed as screen gets cleared, but apparently
// ncurses doesn't know about it, so we need to reload main screen // ncurses doesn't know about it, so we need to reload main screen
endwin(); endwin();
@@ -298,7 +296,7 @@ void Lyrics::Edit()
curs_set(0); curs_set(0);
} }
else else
system(("nohup " + Config.external_editor + " \"" + FilenamePath + "\" > /dev/null 2>&1 &").c_str()); system(("nohup " + Config.external_editor + " \"" + itsFilenamePath + "\" > /dev/null 2>&1 &").c_str());
} }
#ifdef HAVE_CURL_CURL_H #ifdef HAVE_CURL_CURL_H

3
src/lyrics.h
View File

@@ -67,7 +67,8 @@ class Lyrics : public Screen<Scrollpad>
# endif // HAVE_CURL_CURL_H # endif // HAVE_CURL_CURL_H
private: private:
static std::string FilenamePath; std::string itsFilenamePath;
static const std::string Folder; static const std::string Folder;
# ifdef HAVE_CURL_CURL_H # ifdef HAVE_CURL_CURL_H