Refactor Mplayer/mpv