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 44 by douglas, 2008-03-06T15:21:03-08:00 vs.
Revision 47 by douglas, 2008-03-07T03:08:31-08:00

# Line 10 | Line 10
10   #include <vector>
11  
12   #include <Audacious.hpp>
13 + #include <MusicLibrary.hpp>
14  
15   #include "Display.hpp"
16 + #include "Filter.hpp"
17  
18   struct MenuList
19   {
# Line 59 | Line 61 | protected:
61          std::vector<MenuItem *> list;
62  
63   public:
64 <        MenuList(MenuList *parent, Display &display, size_t size = 0);
64 >        MenuList(MenuList *parent, Display &display, size_t size);
65 >        MenuList(MenuList *parent);
66          virtual ~MenuList();
67  
68          MenuList *Enter();
# Line 99 | Line 102 | struct TopList : public MenuList
102          class MusicItem : public MenuItem, public SubItem
103          {
104                  Audacious::Audacious &audacious;
105 +                bool &append;
106 +                MusicLibrary::Library &library;
107  
108          public:
109 <                MusicItem(MenuList *list, Audacious::Audacious &audacious);
109 >                MusicItem(MenuList *list, Audacious::Audacious &audacious, bool &append, MusicLibrary::Library &library);
110  
111                  virtual MenuList *Select();
112                  virtual operator std::string() const;
113          };
114  
115 <        TopList(Display &display, Audacious::Audacious &audacious, bool &append);
115 >        TopList(Display &display, Audacious::Audacious &audacious, bool &append, MusicLibrary::Library &library);
116   };
117  
118   struct ArtistList : public MenuList
119   {
120 <        /*class AllItem : public MenuItem
120 >        class AllItem : public MenuItem
121          {
122 +                Audacious::Audacious &audacious;
123 +                bool &append;
124 +                MusicLibrary::Library &library;
125 +
126 +        public:
127 +                AllItem(MenuList *list, Audacious::Audacious &audacious, bool &append, MusicLibrary::Library &library);
128 +
129 +                virtual MenuList *Select();
130 +                virtual operator std::string() const;
131          };
132  
133 <        class ArtistItem : public MenuItem, public SubItem
133 >        /*class ArtistItem : public MenuItem, public SubItem
134          {
135          };*/
136  
137 <        ArtistList(Display &display, Audacious::Audacious &audacious, bool &append);
137 >        ArtistList(MenuList *parent, Audacious::Audacious &audacious, bool &append, MusicLibrary::Library &library);
138   };
139  
140   struct AlbumList : public MenuList
# Line 133 | Line 147 | struct AlbumList : public MenuList
147          {
148          };*/
149  
150 <        AlbumList(Display &display, Audacious::Audacious &audacious, bool &append);
150 >        AlbumList(MenuList *parent, Audacious::Audacious &audacious, bool &append);
151   };
152  
153   struct SongList : public MenuList
# Line 146 | Line 160 | struct SongList : public MenuList
160          {
161          };*/
162  
163 <        SongList(Display &display, Audacious::Audacious &audacious, bool &append);
163 >        SongList(MenuList *parent, Audacious::Audacious &audacious, bool &append);
164   };
165  
166   #endif//_MenuList_hpp_

Diff Legend

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