merged from lp:mixxx
merged ../daschuers_trunk/mixxx/src/waveform/
compilable but crashing
fixed crash
merged from lp:mixxx
code clean up
clean up finished
merged from lp:mixxx
merged from lp:mixxx
Merge branch 'before_move' into waveform-dejerk

Conflicts:
	mixxx/src/widget/wspinny.cpp
	mixxx/src/widget/wspinny.h
Merge branch 'master' into waveform-dejerk

Conflicts:
	src/dlgprefcontrols.cpp
	src/dlgprefcontrols.h
	src/engine/bpmcontrol.cpp
	src/engine/enginebuffer.cpp
	src/engine/enginebuffer.h
	src/waveform/renderers/waveformwidgetrenderer.cpp
	src/waveform/renderers/waveformwidgetrenderer.h
	src/widget/wspinny.cpp
	src/widget/wspinny.h
some code cleanup
added some comments
Fixed building after change to ControlObjectSlave
introduced EngineBuffer::getVisualPlayPos() to avoid a Map lookup
introduced EngineBuffer::getTrackSamples() to avoid a Hash lookup
fixed include issues and removed unused variables
some variables cleaned up in VSyncThread
changed timer arithmetic to int because we do not accept times > 4.2 s and it is faster on 32 bit targets
Renamed the render and swap functions more significant