extend gkbeears fix for cd to player.cpp
Merge pull request #321 from wolfmanjm/upstreamedge

extend gkbeers fix for cd to player.cpp