diff options
| author | MountainMan <MountainMan@e10066b5-e1e2-0310-b819-94efdf66514b> | 2004-02-02 23:33:41 +0000 |
|---|---|---|
| committer | MountainMan <MountainMan@e10066b5-e1e2-0310-b819-94efdf66514b> | 2004-02-02 23:33:41 +0000 |
| commit | 0cfe4951d3e16fc51a44dcd150090aeae03d1963 (patch) | |
| tree | 2dcc020bfa3b1c1070cef346a543f6bca96778d0 /muggle-plugin | |
| parent | 278d3332f83c789e8ef0c669371a5401a7ab8604 (diff) | |
| download | vdr-plugin-muggle-0cfe4951d3e16fc51a44dcd150090aeae03d1963.tar.gz vdr-plugin-muggle-0cfe4951d3e16fc51a44dcd150090aeae03d1963.tar.bz2 | |
impementation of gdTrackFilters
git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk@22 e10066b5-e1e2-0310-b819-94efdf66514b
Diffstat (limited to 'muggle-plugin')
| -rw-r--r-- | muggle-plugin/mg_media.c | 21 | ||||
| -rw-r--r-- | muggle-plugin/mg_media.h | 8 | ||||
| -rw-r--r-- | muggle-plugin/vdr_menu.c | 9 |
3 files changed, 28 insertions, 10 deletions
diff --git a/muggle-plugin/mg_media.c b/muggle-plugin/mg_media.c index 8243a3f..088ba65 100644 --- a/muggle-plugin/mg_media.c +++ b/muggle-plugin/mg_media.c @@ -3,8 +3,8 @@ * \brief Top level access to media in vdr plugin muggle * for the vdr muggle plugindatabase ******************************************************************** - * \version $Revision: 1.7 $ - * \date $Date: 2004/02/02 22:48:04 $ + * \version $Revision: 1.8 $ + * \date $Date: 2004/02/02 23:33:41 $ * \author Ralf Klueber, Lars von Wedel, Andreas Kellner * \author file owner: $Author: MountainMan $ * @@ -207,7 +207,7 @@ vector<mgFilter*> *mgTrackFilters::getFilters() mgMedia::mgMedia(contentType mediatype) { int errval = 0; - mgTrackFilters *m_trackfilter; + m_trackfilter = NULL; m_mediatype = mediatype; m_sql_trackfilter = "1"; m_defaultView = 1; @@ -250,6 +250,10 @@ mgMedia::mgMedia(contentType mediatype) mgMedia::~mgMedia() { + if( m_trackfilter ) + { + delete m_trackfilter; + } } string mgMedia::getMediaTypeName() @@ -284,9 +288,13 @@ vector<mgFilter*> *mgMedia::getTrackFilters() switch(m_mediatype) { case DUMMY: - //return mgFilters(); + // return mgFilters(); case GD_MP3: - // return m_trackfilters; + if( m_trackfilter == NULL ) + { + m_trackfilter = new gdTrackFilters(); + } + return m_trackfilter->getFilters(); default: break; } @@ -375,6 +383,9 @@ mgTracklist* mgMedia::getTracks() } /* -------------------- begin CVS log --------------------------------- * $Log: mg_media.c,v $ + * Revision 1.8 2004/02/02 23:33:41 MountainMan + * impementation of gdTrackFilters + * * Revision 1.7 2004/02/02 22:48:04 MountainMan * added CVS $Log * diff --git a/muggle-plugin/mg_media.h b/muggle-plugin/mg_media.h index dce48db..d39ce93 100644 --- a/muggle-plugin/mg_media.h +++ b/muggle-plugin/mg_media.h @@ -3,8 +3,8 @@ * \brief Top level access to media in vdr plugin muggle * for the vdr muggle plugindatabase ******************************************************************** - * \version $Revision: 1.6 $ - * \date $Date: 2004/02/02 22:48:04 $ + * \version $Revision: 1.7 $ + * \date $Date: 2004/02/02 23:33:41 $ * \author Ralf Klueber, Lars von Wedel, Andreas Kellner * \author file owner: $Author: MountainMan $ * @@ -179,6 +179,7 @@ class mgMedia contentType m_mediatype; std::string m_sql_trackfilter; int m_defaultView; + mgTrackFilters *m_trackfilter; public: mgMedia(contentType mediatype); @@ -203,6 +204,9 @@ class mgMedia /* -------------------- begin CVS log --------------------------------- * $Log: mg_media.h,v $ + * Revision 1.7 2004/02/02 23:33:41 MountainMan + * impementation of gdTrackFilters + * * Revision 1.6 2004/02/02 22:48:04 MountainMan * added CVS $Log * diff --git a/muggle-plugin/vdr_menu.c b/muggle-plugin/vdr_menu.c index e57e997..1aff6a7 100644 --- a/muggle-plugin/vdr_menu.c +++ b/muggle-plugin/vdr_menu.c @@ -2,12 +2,15 @@ /*! \file vdr_menu.c * \brief Implements menu handling for broswing media libraries within VDR ******************************************************************** - * \version $Revision: 1.4 $ - * \date $Date: 2004/02/02 22:33:24 $ + * \version $Revision: 1.5 $ + * \date $Date: 2004/02/02 23:33:41 $ * \author Ralf Klueber, Lars von Wedel, Andreas Kellner * \author file owner: $Author: MountainMan $ * * $Log: vdr_menu.c,v $ + * Revision 1.5 2004/02/02 23:33:41 MountainMan + * impementation of gdTrackFilters + * * Revision 1.4 2004/02/02 22:33:24 MountainMan * changes in mgFilter classes (and ttheir use in the osd) * @@ -37,7 +40,7 @@ using namespace std; -static const char* alpha_num_keys = "abcdefghijklmnopqrstuvwxyz0123456789-"; +// static const char* alpha_num_keys = "abcdefghijklmnopqrstuvwxyz0123456789-"; // ----------------------- mgMenuTreeItem ------------------ |
