NowPlayingPlugin: Fixed that track title didn't update when playing a radio stream with Winamp.

Plugins/PluginNowPlaying/Player.cpp

@@ -162,7 +162,7 @@ void CPlayer::FindCover()
 	if (!CCover::GetCached(m_CoverPath))
 	{
 		TagLib::FileRef fr(m_FilePath.c_str());
-		if (fr.isNull() || !fr.tag() || !CCover::GetEmbedded(fr, m_CoverPath))
+		if (fr.isNull() || !CCover::GetEmbedded(fr, m_CoverPath))
 		{
 			std::wstring trackFolder = CCover::GetFileFolder(m_FilePath);
 

Plugins/PluginNowPlaying/PlayerITunes.cpp

@@ -202,7 +202,6 @@ void CPlayerITunes::Initialize()
 
 	if (m_iTunes)
 	{
-		//SetTimer(NULL, 0, 1000, QuitCallback);
 		m_Initialized = true;
 
 		// Set up event handler

Plugins/PluginNowPlaying/PlayerWinamp.cpp

@@ -34,6 +34,7 @@ CPlayer* CPlayerWinamp::c_Player = NULL;
 CPlayerWinamp::CPlayerWinamp(WINAMPTYPE type) : CPlayer(),
 	m_Window(),
 	m_UseUnicodeAPI(false),
+	m_PlayingStream(false),
 	m_WinampType(type),
 	m_WinampHandle(),
 	m_WinampAddress()
@@ -140,99 +141,65 @@ void CPlayerWinamp::UpdateData()
 
 		WCHAR wBuffer[MAX_PATH];
 		char cBuffer[MAX_PATH];
-		BOOL ret;
 
 		if (m_UseUnicodeAPI)
 		{
-			ret = ReadProcessMemory(m_WinampHandle, m_WinampAddress, &wBuffer, sizeof(wBuffer), NULL);
+			if (!ReadProcessMemory(m_WinampHandle, m_WinampAddress, &wBuffer, sizeof(wBuffer), NULL))
+			{
+				// Failed to read memory
+				return;
+			}
 		}
 		else
 		{
 			// MediaMonkey doesn't support wide IPC messages
 			int pos = SendMessage(m_Window, WM_WA_IPC, 0, IPC_GETLISTPOS);
 			LPCVOID address = (LPCVOID)SendMessage(m_Window, WM_WA_IPC, pos, IPC_GETPLAYLISTFILE);
-			ret = ReadProcessMemory(m_WinampHandle, address, &cBuffer, sizeof(cBuffer), NULL);
+
-			mbstowcs(wBuffer, cBuffer, MAX_PATH);
+			if (!ReadProcessMemory(m_WinampHandle, address, &cBuffer, sizeof(cBuffer), NULL))
+			{
+				// Failed to read memory
+				return;
 			}
 
-		if (!ret)
+			mbstowcs(wBuffer, cBuffer, MAX_PATH);
-		{
-			LSLog(LOG_ERROR, L"Rainmeter", L"NowPlayingPlugin: Failed to read Winamp memory (file).");
-			return;
 		}
 
 		if (wcscmp(wBuffer, m_FilePath.c_str()) != 0)
 		{
 			++m_TrackCount;
 			m_FilePath = wBuffer;
+			m_PlayingStream = (m_FilePath.find(L"://") != std::wstring::npos);
+
+			if (!m_PlayingStream)
+			{
 				m_Rating = SendMessage(m_Window, WM_WA_IPC, 0, IPC_GETRATING);
 				m_Duration = SendMessage(m_Window, WM_WA_IPC, 1, IPC_GETOUTPUTTIME);
 
 				TagLib::FileRef fr(wBuffer);
-			if (!fr.isNull() && fr.tag())
-			{
 				TagLib::Tag* tag = fr.tag();
+				if (tag)
+				{
 					m_Artist = tag->artist().toWString();
 					m_Album = tag->album().toWString();
 					m_Title = tag->title().toWString();
-			}
-			else
-			{
-				// TagLib couldn't parse the file, try title instead
-				if (m_UseUnicodeAPI)
-				{
-					LPCVOID address = (LPCVOID)SendMessage(m_Window, WM_WA_IPC, 0, IPC_GET_PLAYING_TITLE);
-					ret = ReadProcessMemory(m_WinampHandle, address, &wBuffer, sizeof(wBuffer), NULL);
-				}
-				else
-				{
-					int pos = SendMessage(m_Window, WM_WA_IPC, 0, IPC_GETLISTPOS);
-					LPCVOID address = (LPCVOID)SendMessage(m_Window, WM_WA_IPC, pos, IPC_GETPLAYLISTTITLE);
-					ReadProcessMemory(m_WinampHandle, m_WinampAddress, &cBuffer, sizeof(cBuffer), NULL);
-					ret = mbstowcs(wBuffer, cBuffer, MAX_PATH);
-				}
-
-				if (!ret)
-				{
-					LSLog(LOG_ERROR, L"Rainmeter", L"NowPlayingPlugin: Failed to read Winamp memory (title).");
-					return;
-				}
-
-				std::wstring title = wBuffer;
-				std::wstring::size_type pos = title.find(L". ");
-				if (pos != std::wstring::npos && pos < 5)
-				{
-					pos += 2; // Skip ". "
-					title.erase(0, pos);
-				}
-
-				pos = title.find(L" - ");
-				if (pos != std::wstring::npos)
-				{
-					m_Title.assign(title, 0, pos);
-					pos += 3;  // Skip " - "
-					m_Artist.assign(title, pos, title.length() - pos);
-					m_Album.clear();
-				}
-				else
-				{
-					m_Title = title;
-					m_Artist.clear();
-					m_Album.clear();
-				}
-			}
 
 					if (m_HasLyricsMeasure)
 					{
 						FindLyrics();
 					}
+				}
+				else if (m_HasLyricsMeasure)
+				{
+					m_Lyrics.clear();
+				}
 
 				// Find cover if needed
 				if (m_HasCoverMeasure)
 				{
 					m_CoverPath = GetCacheFile();
 					if (!CCover::GetCached(m_CoverPath) &&
-					!CCover::GetEmbedded(fr, m_CoverPath))
+						(tag && !CCover::GetEmbedded(fr, m_CoverPath)))
 					{
 						std::wstring trackFolder = CCover::GetFileFolder(m_FilePath);
 
@@ -287,6 +254,67 @@ void CPlayerWinamp::UpdateData()
 						}
 					}
 				}
+
+				if (tag)
+				{
+					// Got metadata, return
+					return;
+				}
+			}
+			else
+			{
+				m_Rating = 0;
+				m_Duration = 0;
+				
+				if (m_HasCoverMeasure)
+				{
+					m_CoverPath.clear();
+				}
+			}
+		}
+		else if (!m_PlayingStream)
+		{
+			return;
+		}
+
+		// TagLib couldn't parse the file or Winamp is playing a stream, try to get title
+		if (m_UseUnicodeAPI)
+		{
+			LPCVOID address = (LPCVOID)SendMessage(m_Window, WM_WA_IPC, 0, IPC_GET_PLAYING_TITLE);
+			ReadProcessMemory(m_WinampHandle, address, &wBuffer, sizeof(wBuffer), NULL);
+		}
+		else
+		{
+			int pos = SendMessage(m_Window, WM_WA_IPC, 0, IPC_GETLISTPOS);
+			LPCVOID address = (LPCVOID)SendMessage(m_Window, WM_WA_IPC, pos, IPC_GETPLAYLISTTITLE);
+			ReadProcessMemory(m_WinampHandle, address, &cBuffer, sizeof(cBuffer), NULL);
+			mbstowcs(wBuffer, cBuffer, MAX_PATH);
+		}
+
+		std::wstring title = wBuffer;
+		std::wstring::size_type pos = title.find(L" - ");
+		if (pos != std::wstring::npos)
+		{
+			m_Artist.assign(title, 0, pos);
+			pos += 3;  // Skip " - "
+			m_Title.assign(title, pos, title.length() - pos);
+			m_Album.clear();
+
+			if (m_PlayingStream)
+			{
+				// Remove crap from title if playing radio
+				pos = m_Title.find(L" (");
+				if (pos != std::wstring::npos)
+				{
+					m_Title.resize(pos);
+				}
+			}
+		}
+		else
+		{
+			m_Title = title;
+			m_Artist.clear();
+			m_Album.clear();
 		}
 	}
 }

Plugins/PluginNowPlaying/PlayerWinamp.h

@@ -57,6 +57,7 @@ private:
 
 	HWND m_Window;				// Winamp window
 	bool m_UseUnicodeAPI;
+	bool m_PlayingStream;
 	WINAMPTYPE m_WinampType;
 	HANDLE m_WinampHandle;		// Handle to Winamp process
 	LPCVOID m_WinampAddress;

Plugins/PluginNowPlaying/PluginNowPlaying.rc

@@ -12,7 +12,7 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,1,3,1
+ FILEVERSION 1,1,3,2
  PRODUCTVERSION PRODUCTVER
  FILEFLAGSMASK 0x17L 
 #ifdef _DEBUG
@@ -29,7 +29,7 @@ BEGIN
         BLOCK "040904E4"
         BEGIN
             VALUE "FileDescription", "NowPlaying Plugin for Rainmeter"
-            VALUE "FileVersion", "1.1.3.1"
+            VALUE "FileVersion", "1.1.3.2"
             VALUE "InternalName", "NowPlaying"
             VALUE "LegalCopyright", "Copyright (C) 2011 - Birunthan Mohanathas"
             VALUE "OriginalFilename", "NowPlaying.dll"