Music stopping now happens in the gamestate

Instead of when a new song starts. The problem of dual-songs is not
fixed though