What other type of music was considered A capella from the madrigal