Madrigalist

n.
  1. A composer of madrigals.