The Non-O visa IS a "marriage visa" (meaning it's issued because you're married to a thai)
remember though you can only get a 90 day single entry Non-O visa based on marriage to a thai from the thai consulate in either Sydney or Canberra (depending on where you live in Oz) BOTH embassies have their processing time posted on their websites so check which one you use based on where you live and see what they have posted.
When you enter the country you get stamped in for 90 days, then you have to get the 400K baht in a thai bank account in your name only for 2 months before you can apply for the year "extension of stay" at the immigration office where you live for 1900baht.
You can apply for a yearly extension at most offices when you have 30 days or less left on your 90 day Non-O entry stamp. You apply, get a 30 day under consideration stamp and you go back after that 30 days to get the year extension inked in. <- THEN if you want to leave the country during that year you buy a re-entry permit
You apply thru this web portal
****************************
This shows WHERE you apply based on where you are in Oz