Minor bugfixes

[someplayer] / src / library.h

diff --git a/src/library.h b/src/library.h
index 742c03e..1803c02 100644 (file)
--- a/src/library.h
+++ b/src/library.h
@@ -1,3 +1,22 @@
+/*
+ * SomePlayer - An alternate music player for Maemo 5
+ * Copyright (C) 2010 Nikolay (somebody) Tischenko <niktischenko@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 #ifndef LIBRARY
 #define LIBRARY
 
@@ -9,9 +28,6 @@
 #include "mediascanner.h"
 #include "tagresolver.h"
 
-#define _DATABASE_PATH_ "/tmp"
-#define _PLAYLISTS_PATH_ "/tmp"
-
 // represents media library: tracks, playlists
 // it uses different media storages for tracks and playlists
 // but dynamic playlits will be stored with tracks into the same storage
@@ -31,18 +47,26 @@ namespace SomePlayer {
                        Library(QString databasePath, QString playlistsPath);
                        ~Library();
 
-                       void addDirectory(QString path);
+                       void addDirectory(QString path, bool async = true);
                        void addFile(QString path);
 
+                       QList<QString> getDirectories();
                        QList<QString> getArtists();
-                       QList<QString> getAlbumsForArtist(QString artist);
+                       QMap<QString, int> getAlbumsForArtist(QString artist);
                        QList<Track> getTracksForAlbum(QString album, QString artist);
+                       QList<Track> getAllTracksForArtist(QString artist);
+
+                       QList<Track> searchTracks(QString pattern);
 
                        Playlist getFavorites();
                        Playlist getMostPlayed();
                        Playlist getNeverPlayed();
                        Playlist getRecentlyAdded();
 
+                       int getArtistsCount();
+                       int getAlbumsCount();
+                       int getTracksCount();
+
                        QList<Playlist> getPlaylists();
                        QStringList getPlaylistsNames();
                        Playlist getPlaylist(QString name);
@@ -52,9 +76,20 @@ namespace SomePlayer {
 
                        Playlist getCurrentPlaylist();
                        void saveCurrentPlaylist(const Playlist &playlist);
+                       LastPlayed getLastPlayedForCurPlaylist();
+
+                       void updateDirectories(QList<QString> directories);
+                       void updateAll();
+                       void deleteDirectories(QList<QString> directories);
+
+                       bool isFavorite(Track);
 
                signals:
-                       void addingDone();
+                       void started();
+                       void done();
+                       void busy(QString);
+                       void allCount(int);
+                       void tick();
 
                private:
                        DbStorage *_library_storage;
@@ -62,11 +97,19 @@ namespace SomePlayer {
                        MediaScanner *_scanner;
                        TagResolver *_resolver;
 
+               private slots:
+                       void _scanned(QStringList);
+                       void _decoded(Track);
+
                public slots:
                        void removeTrack(Track);
                        void addTrack(Track);
                        void addToFavorites(Track);
+                       void removeFromFavorites(Track);
                        void updateTrackCount(Track);
+                       void updateTrackMetadata(Track);
+                       void updatePlaylists();
+                       void saveLastPlayedForCurPlaylist(LastPlayed);
                };
 
        };