Add methods to player to allow more intelligent song switching