fix compilation --without-curl

4 files changed, 36 insertions, 31 deletions

diff --git a/src/info.cpp b/src/info.cpp
index 250b33b0..3dfcf1b2 100644
--- a/src/info.cpp
+++ b/src/info.cpp
@@ -45,12 +45,13 @@ const string artists_folder = home_folder + "/.ncmpcpp/artists";
 
 namespace
 {
+#	ifdef HAVE_CURL_CURL_H
 	pthread_t artist_info_downloader;
 	bool artist_info_ready = 0;
 	
-#	ifdef HAVE_CURL_CURL_H
 	void *GetArtistInfo(void *);
 #	endif
+	
 	void GetSongInfo(MPD::Song &, Scrollpad &);
 	const basic_buffer<my_char_t> &ShowTagInInfoScreen(const string &);
 }
@@ -66,17 +67,6 @@ void Info::Resize()
 	sInfo->Resize(COLS, main_height);
 }
 
-bool Info::Ready()
-{
-	if (!artist_info_ready)
-		return false;
-	pthread_join(artist_info_downloader, NULL);
-	sInfo->Flush();
-	artist_info_downloader = 0;
-	artist_info_ready = 0;
-	return true;
-}
-
 void Info::GetSong()
 {
 	if (wCurrent == sInfo)
@@ -152,6 +142,18 @@ void Info::GetSong()
 	}
 }
 
+#ifdef HAVE_CURL_CURL_H
+bool Info::Ready()
+{
+	if (!artist_info_ready)
+		return false;
+	pthread_join(artist_info_downloader, NULL);
+	sInfo->Flush();
+	artist_info_downloader = 0;
+	artist_info_ready = 0;
+	return true;
+}
+
 void Info::GetArtist()
 {
 	if (wCurrent == sInfo)
@@ -241,6 +243,7 @@ void Info::GetArtist()
 			delete artist;
 	}
 }
+#endif // HVAE_CURL_CURL_H
 
 namespace {
 #ifdef HAVE_CURL_CURL_H
diff --git a/src/info.h b/src/info.h
index 08fb945f..ed16d4f0 100644
--- a/src/info.h
+++ b/src/info.h
@@ -29,10 +29,9 @@ namespace Info
 	void Init();
 	void Resize();
 	
-	bool Ready();
-	
 	void GetSong();
 #	ifdef HAVE_CURL_CURL_H
+	bool Ready();
 	void GetArtist();
 #	endif
 }
diff --git a/src/lyrics.cpp b/src/lyrics.cpp
index 6471bf4d..f19c51b2 100644
--- a/src/lyrics.cpp
+++ b/src/lyrics.cpp
@@ -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
 {
diff --git a/src/lyrics.h b/src/lyrics.h
index 703ae2b9..51855de5 100644
--- a/src/lyrics.h
+++ b/src/lyrics.h
@@ -23,20 +23,22 @@
 
 #include "ncmpcpp.h"
 
-#ifdef HAVE_CURL_CURL_H
-# include <pthread.h>
-# include "curl/curl.h"
-
 namespace Lyrics
 {
 	void Init();
 	void Resize();
 	void Update();
 	
-	bool Ready();
 	void Get();
+#	ifdef HAVE_CURL_CURL_H
+	bool Ready();
+#	endif // HAVE_CURL_CURL_H
 }
 
+#ifdef HAVE_CURL_CURL_H
+# include <pthread.h>
+# include "curl/curl.h"
+
 struct LyricsPlugin
 {
 	const char *url;
@@ -47,7 +49,7 @@ struct LyricsPlugin
 
 const char *GetLyricsPluginName(int);
 
-#endif
+#endif // HAVE_CURL_CURL_H
 
 #endif