Revert "[mr3056] Player: some improvements and code style"

This reverts commit b1684395530776b996fd53661b151a49a9e17b61.
(HUGE count of compilation errors, impossible compile. please check compilation BEFORE commit)