I just found, rather randomly, a beautiful new piece of software called Songbird. Songbird is the "firefox of media players" so to speak. You can browse the web and search for new music and videos with ease, as well as catalog all your favorites you have stored on your drives. I highly suggest checking out this vid:
http://www.songbirdnest.com/screencast
Enjoy this one.
Oh and at the end of the vid it says something like "if you like it, buy it" -- that is in reference to the music you have sampled and obtained through use of the search features, not the software itself. Songbird is free and open source.