Yes, there are different definitions of noise. This guy on UBUWeb gives three:
http://www.ubu.com/papers/noise.html
His acoustic definition is the one I was using. It's ok for it to subjectively mean, "unpleasant sounds", colloquially. But music can be unpleasant. A bird singing isn't unpleasant, oh well, I'll just shut up.