Resolve merge conflicts and add extra call to cdio_get_media_changed

Hi @asiviero,

I updated your branch of Clementine to the latest master. The merge conflicts which have arisen due to formatting changes in the source are resolved in this pull request. 

I also added a call to cdio_get_media_changed as I suggested in #4171.