Merge Maxim's Atrac3+ code (2nd patch)

Making a pull request just for the record, you all know what this is about.