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

NowPlaying.dll: iTunes shuffle state change now detected immediately.

Browse Source
This commit is contained in:
Birunthan Mohanathas 2011-11-19 11:44:04 +00:00
parent 42ce3d9666
commit d3a2a8a137
3 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Rainmeter.cpp
View File

@ -1969,12 +1969,10 @@ BOOL CRainmeter::ExecuteBang(const std::wstring& bang, const std::wstring& arg,
ExecuteCommand(command.c_str() + notwhite, meterWindow); ExecuteCommand(command.c_str() + notwhite, meterWindow);
} }
} }
else if (args[i] == L'"' && args[i + 1] == L'"' && args[i + 2] == L'"') else if (args[i] == L'"' && isize > (i + 2) && args[i + 1] == L'"' && args[i + 2] == L'"')
{ {
i += 3; i += 3;
if (isize > i)
{
std::wstring::size_type pos = arg.find(L"\"\"\"", i); std::wstring::size_type pos = arg.find(L"\"\"\"", i);
if (pos != std::wstring::npos) if (pos != std::wstring::npos)
{ {
@ -1983,7 +1981,6 @@ BOOL CRainmeter::ExecuteBang(const std::wstring& bang, const std::wstring& arg,
} }
} }
} }
}
else if (_wcsicmp(name, L"LsBoxHook") == 0) else if (_wcsicmp(name, L"LsBoxHook") == 0)
{ {
// Deprecated. // Deprecated.

42
Plugins/PluginNowPlaying/PlayerITunes.cpp
View File

@ -82,6 +82,10 @@ HRESULT STDMETHODCALLTYPE CPlayerITunes::CEventHandler::Invoke(DISPID dispidMemb
{ {
switch (dispidMember) switch (dispidMember)
{ {
case ITEventDatabaseChanged:
m_Player->OnDatabaseChange();
break;
case ITEventPlayerPlay: case ITEventPlayerPlay:
m_Player->OnStateChange(true); m_Player->OnStateChange(true);
m_Player->OnTrackChange(); m_Player->OnTrackChange();
@ -339,6 +343,37 @@ void CPlayerITunes::UpdateData()
} }
} }
/*
** OnDatabaseChange
**
** Called by iTunes event handler when the database is changed.
**
*/
void CPlayerITunes::OnDatabaseChange()
{
// Check the shuffle state. TODO: Find better way
IITTrack* track;
HRESULT hr = m_iTunes->get_CurrentTrack(&track);
if (SUCCEEDED(hr) && track)
{
IITPlaylist* playlist;
hr = track->get_Playlist(&playlist);
if (SUCCEEDED(hr))
{
VARIANT_BOOL shuffle;
hr = playlist->get_Shuffle(&shuffle);
if (SUCCEEDED(hr))
{
m_Shuffle = (bool)shuffle;
}
playlist->Release();
}
track->Release();
}
}
/* /*
** OnTrackChange ** OnTrackChange
** **
@ -376,13 +411,6 @@ void CPlayerITunes::OnTrackChange()
hr = track->get_Playlist(&playlist); hr = track->get_Playlist(&playlist);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
VARIANT_BOOL shuffle;
hr = playlist->get_Shuffle(&shuffle);
if (SUCCEEDED(hr))
{
m_Shuffle = (bool)shuffle;
}
ITPlaylistRepeatMode repeat; ITPlaylistRepeatMode repeat;
hr = playlist->get_SongRepeat(&repeat); hr = playlist->get_SongRepeat(&repeat);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))

1
Plugins/PluginNowPlaying/PlayerITunes.h
View File

@ -87,6 +87,7 @@ private:
void Initialize(); void Initialize();
void Uninitialize(); void Uninitialize();
void OnDatabaseChange();
void OnTrackChange(); void OnTrackChange();
void OnStateChange(bool playing); void OnStateChange(bool playing);
void OnVolumeChange(int volume); void OnVolumeChange(int volume);