diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/playlist.c | 6 | ||||
| -rw-r--r-- | tools/playlist.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/playlist.c b/tools/playlist.c index e227b9c9..d025c01b 100644 --- a/tools/playlist.c +++ b/tools/playlist.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: playlist.c,v 1.23 2009-06-02 08:36:16 phintuka Exp $ + * $Id: playlist.c,v 1.24 2009-10-31 19:59:50 phintuka Exp $ * */ @@ -634,7 +634,7 @@ static FILE *open_http(const char *PlaylistFile) int cPlaylist::ScanFolder(const char *FolderName, bool Recursive, - bool (config_t::*Filter)(const char *)) + bool (*Filter)(const char *)) { cMutexLock ml(&m_Lock); static int depth = 0; @@ -676,7 +676,7 @@ int cPlaylist::ScanFolder(const char *FolderName, if (stat(Buffer, &st) != 0) continue; } - if((xc.*Filter)(Buffer)) { + if((*Filter)(Buffer)) { /* TODO: Should ScanDir add contents of playlist files ... ? */ if(Filter == &config_t::IsPlaylistFile || !xc.IsPlaylistFile(Buffer)) { n++; diff --git a/tools/playlist.h b/tools/playlist.h index b1332a42..7420643b 100644 --- a/tools/playlist.h +++ b/tools/playlist.h @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: playlist.h,v 1.9 2009-10-26 23:16:46 phintuka Exp $ + * $Id: playlist.h,v 1.10 2009-10-31 19:59:50 phintuka Exp $ * */ @@ -89,7 +89,7 @@ class cPlaylist : protected cList<cPlaylistItem> int ReadPlaylist(const char *PlaylistFile); int ScanFolder(const char *FolderName, bool Recursive = false, - bool (config_t::*Filter)(const char *) = &config_t::IsAudioFile); + bool (*Filter)(const char *) = &config_t::IsAudioFile); friend class cID3Scanner; friend class cPlaylistReader; |