fix merge of master

frames => samples rename in cairocanvas branch caused minor breakage