enhance autoenclosure-detection support

if there are multiple enclosures, we now generate one player with
multiple sources rather than one player per enclosure