That's pretty much it Jim- currently all media on my main PC linked to the router via a HomePlug setup.
Lappy downstairs using WiFi and connected to the HiFi by the jack to RCA cable. Lappy is connected to the 32" LCD TV in the dining room (where the HiFi is) and now to the HD2 via Salling! I'll probably swap the lappy for something like a Asrock Ion before long.
I do plan to move the media to a WHS though, as the PC in the study upstairs isn't quiet, and it's bright blue lights can be a disturbance at night if the cats push the bedroom door open