Replace *bitmaplayer with *layer, and more