ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/truck/DashInterface/MenuList.hpp
(Generate patch)

Comparing DashInterface/MenuList.hpp (file contents):
Revision 50 by douglas, 2008-03-09T14:15:43-07:00 vs.
Revision 51 by douglas, 2008-03-09T14:24:55-07:00

# Line 10 | Line 10
10   #include <vector>
11  
12   #include <Audacious.hpp>
13 < #include <MusicLibrary.hpp>
13 > #include <Music.hpp>
14  
15   #include "Display.hpp"
16   #include "Filter.hpp"
# Line 120 | Line 120 | class TopList : public MenuList
120  
121          class MusicItem : public MenuItem, public SubItem, public MenuList::MusicItem
122          {
123 <                MusicLibrary::Library &library;
123 >                Music::Library &library;
124  
125          public:
126 <                MusicItem(MenuList *list, Audacious::Audacious &audacious, bool &append, MusicLibrary::Library &library);
126 >                MusicItem(MenuList *list, Audacious::Audacious &audacious, bool &append, Music::Library &library);
127  
128                  virtual MenuList *Select();
129                  virtual operator std::string() const;
130          };
131  
132   public:
133 <        TopList(Display &display, Audacious::Audacious &audacious, bool &append, MusicLibrary::Library &library);
133 >        TopList(Display &display, Audacious::Audacious &audacious, bool &append, Music::Library &library);
134   };
135  
136   class ArtistList : public MenuList
137   {
138          class AllItem : public MenuItem, public MusicItem
139          {
140 <                MusicLibrary::Library &library;
140 >                Music::Library &library;
141  
142          public:
143 <                AllItem(MenuList *list, Audacious::Audacious &audacious, bool &append, MusicLibrary::Library &library);
143 >                AllItem(MenuList *list, Audacious::Audacious &audacious, bool &append, Music::Library &library);
144  
145                  virtual MenuList *Select();
146                  virtual operator std::string() const;
# Line 148 | Line 148 | class ArtistList : public MenuList
148  
149          class ArtistItem : public MenuItem, public SubItem, public MusicItem
150          {
151 <                MusicLibrary::Artist artist;
151 >                Music::Artist artist;
152  
153          public:
154 <                ArtistItem(MenuList *list, Audacious::Audacious &audacious, bool append, MusicLibrary::Artist artist);
154 >                ArtistItem(MenuList *list, Audacious::Audacious &audacious, bool append, Music::Artist artist);
155                  virtual ~ArtistItem() {}
156  
157                  virtual MenuList *Select();
# Line 159 | Line 159 | class ArtistList : public MenuList
159          };
160  
161   public:
162 <        ArtistList(MenuList *parent, Audacious::Audacious &audacious, bool &append, MusicLibrary::Library &library);
162 >        ArtistList(MenuList *parent, Audacious::Audacious &audacious, bool &append, Music::Library &library);
163   };
164  
165   class AlbumList : public MenuList

Diff Legend

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