The last time I was in Edinburgh was at festival time August 1999 (I think) and the Waverly upstairs was a fringe venue with gigs run by Allan Johnston. I don't know if they've kept the music up since then or not.