diff --git a/libsaria/library/library.cpp b/libsaria/library/library.cpp index 102509ad..a13615ab 100644 --- a/libsaria/library/library.cpp +++ b/libsaria/library/library.cpp @@ -41,19 +41,6 @@ namespace libsaria it->update(); } - bool library::get_info(ino_t &id, void (*func)(Track &)) - { - bool found = false; - list::iterator it; - for (it = path_list.begin(); it != path_list.end(); it++) { - if (it->get_info_id(id, func) == true) { - found = true; - break; - } - } - return found; - } - void library::refresh() { rebuild_list(); diff --git a/libsaria/library/list.cpp b/libsaria/library/list.cpp index a727c7e6..4059ffaa 100644 --- a/libsaria/library/list.cpp +++ b/libsaria/library/list.cpp @@ -54,6 +54,17 @@ namespace libsaria } } + bool library::get_info(ino_t &id, void (*func)(Track &)) + { + list::iterator it; + if (find_id(id, it)) { + Track tag(&(*it)); + func(tag); + return true; + } + return false; + } + unsigned int library::size() { return play_list.size(); diff --git a/libsaria/library/path.cpp b/libsaria/library/path.cpp index 40577db1..b4ac18a8 100644 --- a/libsaria/library/path.cpp +++ b/libsaria/library/path.cpp @@ -33,18 +33,6 @@ list::iterator LibraryPath::find_id(ino_t &id) return it; } -bool LibraryPath::get_info_id(ino_t &id, void (*func)(Track &)) -{ - list::iterator it; - it = find_id(id); - if (it != file_list.end()) { - Track track = Track(&(*it)); - func(track); - return true; - } - return false; -} - LibraryPath::LibraryPath(string dir) { path = dir;