fix stdstring warnings, revert dsplayer.h and a fix in playercontroller