diff options
| author | Andrzej Rybczak <electricityispower@gmail.com> | 2009-05-03 13:53:15 +0200 |
|---|---|---|
| committer | Andrzej Rybczak <electricityispower@gmail.com> | 2009-05-03 13:53:15 +0200 |
| commit | 72acc09b264b2f93c7dfdf4f405e6e7457b6a07e (patch) | |
| tree | 1d170b7ba0bb2d478d1227146ff287214ceffa79 /src/lyrics.cpp | |
| parent | b0317b695ad2cee33195d76778d62b15eb315218 (diff) | |
fix compilation if there were no curl dev files installed
Diffstat (limited to 'src/lyrics.cpp')
| -rw-r--r-- | src/lyrics.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lyrics.cpp b/src/lyrics.cpp index 4071616a..54cd67b6 100644 --- a/src/lyrics.cpp +++ b/src/lyrics.cpp @@ -58,12 +58,12 @@ bool Lyrics::Reload = 0; #ifdef HAVE_CURL_CURL_H bool Lyrics::Ready = 0; -#endif // HAVE_CURL_CURL_H #ifdef HAVE_PTHREAD_H pthread_t *Lyrics::Downloader = 0; pthread_mutex_t Global::CurlLock = PTHREAD_MUTEX_INITIALIZER; #endif // HAVE_PTHREAD_H +#endif // HAVE_CURL_CURL_H Lyrics *myLyrics = new Lyrics; @@ -81,10 +81,10 @@ void Lyrics::Resize() void Lyrics::Update() { -# ifdef HAVE_PTHREAD_H +# if defined(HAVE_CURL_CURL_H) && defined(HAVE_PTHREAD_H) if (myLyrics->Ready) myLyrics->Take(); -# endif // HAVE_PTHREAD_H +# endif // HAVE_CURL_CURL_H && HAVE_PTHREAD_H if (!Reload) return; @@ -104,7 +104,7 @@ void Lyrics::SwitchTo() } else { -# ifdef HAVE_PTHREAD_H +# if defined(HAVE_CURL_CURL_H) && defined(HAVE_PTHREAD_H) if (Downloader && !Ready) { ShowMessage("Lyrics are being downloaded..."); @@ -112,7 +112,7 @@ void Lyrics::SwitchTo() } else if (Ready) Take(); -# endif // HAVE_PTHREAD_H +# endif // HAVE_CURL_CURL_H && HAVE_PTHREAD_H const MPD::Song *s = Reload ? myPlaylist->NowPlayingSong() : myScreen->CurrentSong(); @@ -136,10 +136,10 @@ void Lyrics::SwitchTo() # ifdef HAVE_CURL_CURL_H static_cast<Window &>(*w) << "Fetching lyrics..."; w->Window::Refresh(); -# endif // HAVE_CURL_CURL_H # ifdef HAVE_PTHREAD_H if (!Downloader) # endif // HAVE_PTHREAD_H +# endif // HAVE_CURL_CURL_H { string file = locale_to_utf_cpy(itsSong.GetArtist()) + " - " + locale_to_utf_cpy(itsSong.GetTitle()) + ".txt"; EscapeUnallowedChars(file); @@ -168,7 +168,7 @@ void Lyrics::SwitchTo() } else { -# ifdef HAVE_PTHREAD_H +# if defined(HAVE_CURL_CURL_H) && defined(HAVE_PTHREAD_H) Downloader = new pthread_t; pthread_create(Downloader, 0, Get, this); # elif defined(HAVE_CURL_CURL_H) |