Added separate makeup controls and master trim

Signed-off-by: Damien Zammit <damien@zamaudio.com>