diff options
| author | lvw <lvw@e10066b5-e1e2-0310-b819-94efdf66514b> | 2004-10-10 14:00:31 +0000 |
|---|---|---|
| committer | lvw <lvw@e10066b5-e1e2-0310-b819-94efdf66514b> | 2004-10-10 14:00:31 +0000 |
| commit | 105e6ee0286fc1c012a9bd9a32966a7cd34a840a (patch) | |
| tree | ec8c0389e718c8615581ab2ba940c66accdf1481 | |
| parent | 6af7bbbe44879b05e5fcea78bde036eeeebbc854 (diff) | |
| download | vdr-plugin-muggle-105e6ee0286fc1c012a9bd9a32966a7cd34a840a.tar.gz vdr-plugin-muggle-105e6ee0286fc1c012a9bd9a32966a7cd34a840a.tar.bz2 | |
Merged bugfixes from 0.0.7
git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk@221 e10066b5-e1e2-0310-b819-94efdf66514b
| -rw-r--r-- | muggle-plugin/muggle.c | 2 | ||||
| -rw-r--r-- | muggle-plugin/muggle.doxygen | 2 | ||||
| -rw-r--r-- | muggle-plugin/vdr_player.c | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/muggle-plugin/muggle.c b/muggle-plugin/muggle.c index 14ff37b..4cc7b0d 100644 --- a/muggle-plugin/muggle.c +++ b/muggle-plugin/muggle.c @@ -22,7 +22,7 @@ #include <getopt.h> #include <config.h> -static const char *VERSION = "0.0.6"; +static const char *VERSION = "0.0.7"; static const char *DESCRIPTION = "Media juggle plugin for VDR"; static const char *MAINMENUENTRY = "Muggle"; diff --git a/muggle-plugin/muggle.doxygen b/muggle-plugin/muggle.doxygen index 8703db4..d393679 100644 --- a/muggle-plugin/muggle.doxygen +++ b/muggle-plugin/muggle.doxygen @@ -23,7 +23,7 @@ PROJECT_NAME = Muggle media plugin # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 0.0.5 +PROJECT_NUMBER = 0.0.7 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/muggle-plugin/vdr_player.c b/muggle-plugin/vdr_player.c index d69897f..d46a4af 100644 --- a/muggle-plugin/vdr_player.c +++ b/muggle-plugin/vdr_player.c @@ -1174,23 +1174,26 @@ void mgPlayerControl::Display() } // now an osd is open, go on - if( m_progress_view ) { +#if VDRVERSNUM >= 10307 if( m_menu ) { delete m_menu; m_menu = NULL; } +#endif ShowProgress(); } else { +#if VDRVERSNUM >= 10307 if( m_display ) { delete m_display; m_display = NULL; } +#endif ShowContents(); } } |
