ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/repos/DecentralizedMedia/DecentralizedMedia.cpp
(Generate patch)

Comparing DecentralizedMedia/DecentralizedMedia.cpp (file contents):
Revision 540 by douglas, 2005-07-01T23:56:04-07:00 vs.
Revision 541 by douglas, 2005-07-02T18:26:58-07:00

# Line 105 | Line 105 | DecentralizedMedia::~DecentralizedMedia(
105   {
106          if (!process.IsEmpty())
107          {
108 <                _P<api::Thread> thread(new _H<api::Thread>(hop::BindAll(&DecentralizedMedia::Destroy, this)));
108 >                _R<api::Thread> thread(new _H<api::Thread>(hop::BindAll(&DecentralizedMedia::Destroy, this)));
109  
110                  bmp.Quit();
111  
# Line 115 | Line 115 | DecentralizedMedia::~DecentralizedMedia(
115  
116   _L<cse::String> DecentralizedMedia::GetArtists() const
117   {
118 <        _P<dbi::ResultSet> artists_(connection->Execute(_B("SELECT DISTINCT artist FROM files WHERE live = TRUE")));
118 >        _R<dbi::ResultSet> artists_(connection->Execute(_B("SELECT DISTINCT artist FROM files WHERE live = TRUE")));
119          _L<cse::String> artists;
120  
121          while (artists_->MoveNext())
# Line 126 | Line 126 | _L<cse::String> DecentralizedMedia::GetA
126  
127   _L<cse::String> DecentralizedMedia::GetTitles() const
128   {
129 <        _P<dbi::ResultSet> titles_(connection->Execute(_B("SELECT DISTINCT title FROM files WHERE live = TRUE")));
129 >        _R<dbi::ResultSet> titles_(connection->Execute(_B("SELECT DISTINCT title FROM files WHERE live = TRUE")));
130          _L<cse::String> titles;
131  
132          while (titles_->MoveNext())
# Line 137 | Line 137 | _L<cse::String> DecentralizedMedia::GetT
137  
138   _L<cse::String> DecentralizedMedia::GetAlbums() const
139   {
140 <        _P<dbi::ResultSet> albums_(connection->Execute(_B("SELECT DISTINCT album FROM files WHERE live = TRUE")));
140 >        _R<dbi::ResultSet> albums_(connection->Execute(_B("SELECT DISTINCT album FROM files WHERE live = TRUE")));
141          _L<cse::String> albums;
142  
143          while (albums_->MoveNext())
# Line 148 | Line 148 | _L<cse::String> DecentralizedMedia::GetA
148  
149   _L<cse::String> DecentralizedMedia::GetGenres() const
150   {
151 <        _P<dbi::ResultSet> genres_(connection->Execute(_B("SELECT DISTINCT album FROM files WHERE live = TRUE")));
151 >        _R<dbi::ResultSet> genres_(connection->Execute(_B("SELECT DISTINCT album FROM files WHERE live = TRUE")));
152          _L<cse::String> genres;
153  
154          while (genres_->MoveNext())
# Line 159 | Line 159 | _L<cse::String> DecentralizedMedia::GetG
159  
160   _L<MediaFolder> DecentralizedMedia::GetFolders() const
161   {
162 <        _P<dbi::ResultSet> paths(connection->Execute(_B("SELECT DISTINCT root FROM files WHERE live = TRUE")));
162 >        _R<dbi::ResultSet> paths(connection->Execute(_B("SELECT DISTINCT root FROM files WHERE live = TRUE")));
163          _L<MediaFolder> folders;
164  
165          while (paths->MoveNext())
# Line 198 | Line 198 | void DecentralizedMedia::Process(const n
198  
199   void DecentralizedMedia::Media(ios::Reader& media, const api::Address& host)
200   {
201 <        _P<xml::Document> document(xml::Parse(media));
201 >        _R<xml::Document> document(xml::Parse(media));
202          api::Pcre::RegEx share("^[0-9a-f]+$");
203          
204          _foreach (const xml::NodeSet, folder, *document/"media"/"folder")
# Line 207 | Line 207 | void DecentralizedMedia::Media(ios::Read
207  
208                  if (api::Pcre::RegEx::Match match = share(path))
209                  {
210 <                        _P<Share> share(new _H<Share>(connection, host, match[0]));
210 >                        _R<Share> share(new _H<Share>(connection, host, match[0]));
211  
212                          path = share->path.GetPath();
213  
# Line 223 | Line 223 | void DecentralizedMedia::Media(ios::Read
223          }
224   }
225  
226 < void DecentralizedMedia::Media(const _P<xml::Node>& folder, const api::Path& path, const api::Path& root)
226 > void DecentralizedMedia::Media(const _R<xml::Node>& folder, const api::Path& path, const api::Path& root)
227   {
228          MediaFolder(connection, path, root);
229  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines