Add the ability to cancel a running CD rip.
Merge branch 'master' into ripcd-cancel

Conflicts:
	src/ui/ripcd.cpp
Run 'make format'
Add a mutex to protect a variable shared between threads.
Give the mutex lockers a tighter scope.
Initialise cancel_requested_ to false in the constructor's initialisation list.
Merge pull request #4340 from paperbagcorner/ripcd-cancel

Fix the cancel functionality in the CD ripper
Fix block analyzer framerate

Block analyzer uses an internal variable m_step to determine how
long to hold a bar up. This is dependant on framerate, however it is
only set on creation or resize of the analyzer. This patch changes
this value whenever the framerate is changed, preventing the analyzer
from appearing wildly fast or extremely slow until a restart.
Remove "using" statement in header
Make framerate notification less nasty

Now uses a virtual function in Analyser::Base to notify any
analyser which whishes to listen
Merge pull request #4343 from TheUbuntuGuy/master

Fix block analyzer framerate
Add new now playing widget mode

In an attempt to satisfy many users, I have added another mode to the
now playing widget. This shows the large cover art however it draws the song details
below the artwork, without the gradient that everyone seems to have a problem with.
This is just an option and all the original functionality is unchanged.
Add placeholder text for safety

Just to make sure that details_ has the correct height when initializing
Change height on details change

When the details change, the height is updated so if the details
now span more or fewer lines we can accompany that
Merge pull request #4347 from TheUbuntuGuy/master

Add new now playing widget mode.  Fixes #853
Clean up a lockfile from /tmp on exit.  Fixes #4348
Remove temporary cover-art from /tmp on exit.  Fixes #4349
Merge branch 'master' into streamserve