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

fix compilation --without-curl

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-02-13 17:39:53 +01:00
parent 8ba72bc78a
commit 08e162f6ac
4 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/lyrics.cpp
View File

@@ -48,8 +48,10 @@ pthread_mutex_t Global::curl = PTHREAD_MUTEX_INITIALIZER;
namespace
{
# ifdef HAVE_CURL_CURL_H
pthread_t lyrics_downloader;
bool lyrics_ready;
# endif
void *GetLyrics(void *);
}
@@ -77,17 +79,6 @@ void Lyrics::Update()
reload_lyrics = 0;
}
bool Lyrics::Ready()
{
if (!lyrics_ready)
return false;
pthread_join(lyrics_downloader, NULL);
sLyrics->Flush();
lyrics_downloader = 0;
lyrics_ready = 0;
return true;
}
void Lyrics::Get()
{
if (wCurrent == sLyrics && !reload_lyrics)
@@ -196,6 +187,16 @@ void Lyrics::Get()
}
#ifdef HAVE_CURL_CURL_H
bool Lyrics::Ready()
{
if (!lyrics_ready)
return false;
pthread_join(lyrics_downloader, NULL);
sLyrics->Flush();
lyrics_downloader = 0;
lyrics_ready = 0;
return true;
}
namespace
{