Code style fix in mixxx.h
merged conflicts with master