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

NowPlayingPlugin:

Browse Source 
- Fixed that the OpenPlayer bang didn't work correctly since r848
- Fixed that the "SetPosition +n" bang didn't work correctly
This commit is contained in:
Birunthan Mohanathas 2011-07-29 10:42:10 +00:00
parent fb004083d2
commit 45007fc8d8
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Plugins/PluginNowPlaying/NowPlaying.cpp
View File

@ -447,14 +447,7 @@ void ExecuteBang(LPCTSTR bang, UINT id)
ParentMeasure* parent = child->parent; ParentMeasure* parent = child->parent;
CPlayer* player = parent->player; CPlayer* player = parent->player;
if (!player->IsInitialized()) if (_wcsicmp(bang, L"Pause") == 0)
{
if (_wcsicmp(bang, L"OpenPlayer") == 0 || _wcsicmp(bang, L"TogglePlayer") == 0)
{
player->OpenPlayer(parent->playerPath);
}
}
else if (_wcsicmp(bang, L"Pause") == 0)
{ {
player->Pause(); player->Pause();
} }
@ -474,14 +467,18 @@ void ExecuteBang(LPCTSTR bang, UINT id)
{ {
player->Next(); player->Next();
} }
else if (_wcsicmp(bang, L"Previous") == 0) else if (_wcsicmp(bang, L"OpenPlayer") == 0)
{ {
player->Previous(); player->OpenPlayer(parent->playerPath);
} }
else if (_wcsicmp(bang, L"ClosePlayer") == 0 || _wcsicmp(bang, L"TogglePlayer") == 0) else if (_wcsicmp(bang, L"ClosePlayer") == 0)
{ {
player->ClosePlayer(); player->ClosePlayer();
} }
else if (_wcsicmp(bang, L"TogglePlayer") == 0)
{
player->IsInitialized() ? player->ClosePlayer() : player->OpenPlayer(parent->playerPath);
}
else else
{ {
LPCTSTR arg = wcschr(bang, L' '); LPCTSTR arg = wcschr(bang, L' ');
@ -492,7 +489,7 @@ void ExecuteBang(LPCTSTR bang, UINT id)
if (wcsnicmp(bang, L"SetPosition", 11) == 0) if (wcsnicmp(bang, L"SetPosition", 11) == 0)
{ {
int position = (_wtoi(arg) * player->GetDuration()) / 100; int position = (_wtoi(arg) * (int)player->GetDuration()) / 100;
if (arg[0] == L'+' || arg[0] == L'-') if (arg[0] == L'+' || arg[0] == L'-')
{ {
position += player->GetPosition(); position += player->GetPosition();

4
Plugins/PluginNowPlaying/PluginNowPlaying.rc
View File

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