Media player updates

* Separate code for video player
* Audio player code reverted to pre-video player updates
Merge upstream/master
Merge pull request #747 from timhobbs/master

Media player updates