I would normally distinguish the two by saying whistling or whistle playing, whistler or whistle player. Maybe the Gaelic doesn't differentiate but it's more likely to be a sloppy transaction.