oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Partition: eliminate GlobalEvents.hxx, add mask constants

Browse Source
This commit is contained in:
Max Kellermann
2016-03-10 23:10:14 +01:00
parent 5ca6026787
commit 7c53df2ed1
4 changed files with 10 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Partition.cxx
View File

@@ -23,7 +23,6 @@
#include "DetachedSong.hxx"
#include "mixer/Volume.hxx"
#include "Idle.hxx"
#include "GlobalEvents.hxx"
Partition::Partition(Instance &_instance,
unsigned max_length,
@@ -37,15 +36,6 @@ Partition::Partition(Instance &_instance,
{
}
void
Partition::EmitGlobalEvent(GlobalEvents::Event event)
{
assert((unsigned)event < GlobalEvents::MAX);
const unsigned mask = 1u << unsigned(event);
global_events.OrMask(mask);
}
void
Partition::EmitIdle(unsigned mask)
{
@@ -106,13 +96,13 @@ Partition::OnQueueSongStarted()
void
Partition::OnPlayerSync()
{
EmitGlobalEvent(GlobalEvents::PLAYLIST);
EmitGlobalEvent(SYNC_WITH_PLAYER);
}
void
Partition::OnPlayerTagModified()
{
EmitGlobalEvent(GlobalEvents::TAG);
EmitGlobalEvent(TAG_MODIFIED);
}
void
@@ -127,9 +117,9 @@ Partition::OnMixerVolumeChanged(gcc_unused Mixer &mixer, gcc_unused int volume)
void
Partition::OnGlobalEvent(unsigned mask)
{
if ((mask & (1u << unsigned(GlobalEvents::TAG))) != 0)
if ((mask & TAG_MODIFIED) != 0)
TagModified();
if ((mask & (1u << unsigned(GlobalEvents::PLAYLIST))) != 0)
if ((mask & SYNC_WITH_PLAYER) != 0)
SyncWithPlayer();
}