What engineering field would be better for designing audio equipment like headphones and speakers?

I'm currently a computer engineering major here at UNT and was planning on going into VLSI, but recently I was thinking of combining my passion for music with my passion for electronics and going into something where I made sound equipment like headphones. If I were to go down this path I would want to make the actual electronics in the devices. Would computer engineering be okay for this or should I switch to something like electrical engineering?