Get demo working with gapless and non-gapless.