The website is excellent and does list where you can go hear and dance to samba in Salvador but I lifted this blurb from the site which really was my point...

"Ederaldo went on to see his music recorded by a host of Brazilian greats, including Jair Rodrigues, Alcione, and Leny Andrade, but, with the shift in the music of Bahia's Carnival to the mixed bag known locally here as "axé music", he went from being an acknowledged force behind real Bahian music of substance to a representative of a less popular and commercially unviable style (samba; would you believe it?!). It was too much for him and in the early 90's he sank from site, rarely leaving his apartment in the Salvador neighborhood of Vila Laura."

...that samba exists but is less popular than other forms of music; Axe, samba reggae, forro.... You won't go to a club and dance "samba de roda" MAYBE if you know some older folks you could catch a samba de roda at their home...but I've noticed that these days samba de roda has become more folklore with groups paid by the government to present it in the street and try to revive it.

Rio is another story all together.

beijos!