chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

- PowerPlugin: Fixed crash when waking up from sleep/hibernation in some cases

Browse Source 
- Code cleanup
This commit is contained in:
Birunthan Mohanathas
2011-10-12 13:34:04 +00:00
parent 7091b46689
commit 7790449f2a
30 changed files with 278 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Plugins/PluginNowPlaying/NowPlaying.cpp
View File

@ -61,7 +61,7 @@ UINT Initialize(HMODULE instance, LPCTSTR iniFile, LPCTSTR section, UINT id)
}
else
{
LSLog(LOG_ERROR, L"Rainmeter", L"NowPlayingPlugin: PluginBridge error");
LSLog(LOG_ERROR, NULL, L"NowPlaying.dll: PluginBridge error");
}
g_Instance = instance;
@ -100,12 +100,12 @@ UINT Initialize(HMODULE instance, LPCTSTR iniFile, LPCTSTR section, UINT id)
if (!child->parent)
{
// The referenced section doesn't exist
std::wstring error = L"NowPlayingPlugin: Invalid PlayerName=";
std::wstring error = L"NowPlaying.dll: Invalid PlayerName=";
error += str;
error += L" in [";
error += section;
error += L"]";
LSLog(LOG_WARNING, L"Rainmeter", error.c_str());
LSLog(LOG_WARNING, NULL, error.c_str());
delete child;
return maxValue;
}
@ -156,12 +156,12 @@ UINT Initialize(HMODULE instance, LPCTSTR iniFile, LPCTSTR section, UINT id)
}
else
{
std::wstring error = L"NowPlayingPlugin: Invalid PlayerName=";
std::wstring error = L"NowPlaying.dll: Invalid PlayerName=";
error += str;
error += L" in [";
error += section;
error += L"]";
LSLog(LOG_ERROR, L"Rainmeter", error.c_str());
LSLog(LOG_ERROR, NULL, error.c_str());
delete parent;
delete child;
return maxValue;
@ -250,7 +250,7 @@ UINT Initialize(HMODULE instance, LPCTSTR iniFile, LPCTSTR section, UINT id)
}
else if (_wcsicmp(L"LYRICS", str) == 0)
{
LSLog(LOG_WARNING, L"Rainmeter", L"NowPlayingPlugin: Using undocumented PlayerType=LYRICS!");
LSLog(LOG_WARNING, NULL, L"NowPlaying.dll: Using undocumented PlayerType=LYRICS!");
child->type = MEASURE_LYRICS;
}
else if (_wcsicmp(L"FILE", str) == 0)
@ -259,12 +259,12 @@ UINT Initialize(HMODULE instance, LPCTSTR iniFile, LPCTSTR section, UINT id)
}
else
{
std::wstring error = L"NowPlayingPlugin: Invalid PlayerType=";
std::wstring error = L"NowPlaying.dll: Invalid PlayerType=";
error += str;
error += L" in [";
error += section;
error += L"]";
LSLog(LOG_WARNING, L"Rainmeter", error.c_str());
LSLog(LOG_WARNING, NULL, error.c_str());
}
child->parent->player->AddMeasure(child->type);
@ -580,9 +580,13 @@ void ExecuteBang(LPCTSTR bang, UINT id)
}
else
{
LSLog(LOG_WARNING, L"Rainmeter", L"NowPlayingPlugin: Unknown bang!");
LSLog(LOG_WARNING, NULL, L"NowPlaying.dll: Unknown bang");
}
}
else
{
LSLog(LOG_WARNING, NULL, L"NowPlaying.dll: Unknown bang");
}
}
}
}