Madrigalist
Mad·ri·gal·ist
Madrigalist
n.
A composer of madrigals.