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

split data_ready to lyrics_ready and artist_info_ready to avoid main loop lockup

Browse Source
This commit is contained in:
unK
2008-10-02 15:23:33 +02:00
parent e6b7e22485
commit 8133830af9
2 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/ncmpcpp.cpp
View File

@@ -109,7 +109,8 @@ NcmpcppScreen prev_screen;
#ifdef HAVE_CURL_CURL_H
pthread_t lyrics_downloader;
pthread_t artist_info_downloader;
extern bool data_ready;
extern bool artist_info_ready;
extern bool lyrics_ready;
#endif
bool dont_change_now_playing = 0;
@@ -677,26 +678,27 @@ int main(int argc, char *argv[])
reload_lyrics = 0;
}
# ifdef HAVE_CURL_CURL_H
if (data_ready)
if (artist_info_ready)
{
void *result;
string *str_result = 0;
if (lyrics_downloader)
{
pthread_join(lyrics_downloader, &result);
str_result = static_cast<string *>(result);
sLyrics->Add(*str_result);
lyrics_downloader = 0;
}
if (artist_info_downloader)
{
pthread_join(artist_info_downloader, &result);
str_result = static_cast<string *>(result);
sInfo->Add(*str_result);
artist_info_downloader = 0;
}
pthread_join(artist_info_downloader, &result);
str_result = static_cast<string *>(result);
sInfo->Add(*str_result);
delete str_result;
data_ready = 0;
artist_info_downloader = 0;
artist_info_ready = 0;
}
else if (lyrics_ready)
{
void *result;
string *str_result = 0;
pthread_join(lyrics_downloader, &result);
str_result = static_cast<string *>(result);
sLyrics->Add(*str_result);
delete str_result;
lyrics_downloader = 0;
lyrics_ready = 0;
}
# endif
// lyrics end