--- DecentralizedMedia/MediaFile.cpp	2005/06/20 07:19:47	514
+++ DecentralizedMedia/MediaFile.cpp	2005/07/03 01:26:58	541
@@ -4,13 +4,15 @@
 //
 // $Id$
 
-#include "MediaFile.hpp"
+#include <menes/standard.hh>
 
 #include <menes-dbi/resultset.hpp>
 
-MediaFile::MediaFile(_H<dbi::Connection>& connection, const api::Path& path) : connection(connection), path(path)
+#include "MediaFile.hpp"
+
+MediaFile::MediaFile(_R<dbi::Connection>& connection, const api::Path& path) : connection(connection), path(path)
 {
-	_H<dbi::ResultSet> info(connection->Parse(_B("SELECT artist, title, album, genre FROM files WHERE path = ?"))->Execute(path.GetPath()));
+	_R<dbi::ResultSet> info(connection->Parse(_B("SELECT artist, title, album, genre FROM files WHERE path = ?"))->Execute(path.GetPath()));
 
 	if (info->MoveNext())
 	{
@@ -23,9 +25,9 @@ MediaFile::MediaFile(_H<dbi::Connection>
 		throw;
 }
 
-MediaFile::MediaFile(_H<dbi::Connection>& connection, const api::Path& path, const ext::String& artist, const ext::String& title, const ext::String& album, const ext::String& genre, const api::Path& root) : connection(connection), path(path), artist(artist), title(title), album(album), genre(genre)
+MediaFile::MediaFile(_R<dbi::Connection>& connection, const api::Path& path, const cse::String& artist, const cse::String& title, const cse::String& album, const cse::String& genre, const api::Path& root) : connection(connection), path(path), artist(artist), title(title), album(album), genre(genre)
 {
-	_H<dbi::ResultSet> path_(connection->Parse(_B("SELECT path FROM files WHERE path = ?"))->Execute(path.GetPath()));
+	_R<dbi::ResultSet> path_(connection->Parse(_B("SELECT path FROM files WHERE path = ?"))->Execute(path.GetPath()));
 
 	if (path_->MoveNext())
 	{