diff options
| -rw-r--r-- | mg_playlist.c | 6 | ||||
| -rw-r--r-- | vdr_menu.c | 14 | ||||
| -rw-r--r-- | vdr_player.c | 11 |
3 files changed, 19 insertions, 12 deletions
diff --git a/mg_playlist.c b/mg_playlist.c index 38d4d0f..83bdbd8 100644 --- a/mg_playlist.c +++ b/mg_playlist.c @@ -2,8 +2,8 @@ * \file mg_playlist.c * \brief defines functions to be executed on playlists for the vdr muggle plugindatabase * - * \version $Revision: 1.5 $ - * \date $Date: 2004/07/26 22:20:54 $ + * \version $Revision: 1.6 $ + * \date $Date: 2004/07/27 20:50:54 $ * \author Ralf Klueber, Lars von Wedel, Andreas Kellner * \author Responsible author: $Author: lvw $ * @@ -158,7 +158,7 @@ void mgPlaylist::gotoPosition(unsigned int position) // proceeds to the next item void mgPlaylist::skipFwd() { - if( m_current_idx + 1 <= m_list.size() ) // unless loop mode + if( m_current_idx + 1 < m_list.size() ) // unless loop mode { m_current_idx ++; } @@ -2,12 +2,12 @@ * \file vdr_menu.c * \brief Implements menu handling for browsing media libraries within VDR * - * \version $Revision: 1.26 $ - * \date $Date: 2004/07/27 06:57:35 $ + * \version $Revision: 1.27 $ + * \date $Date: 2004/07/27 20:50:54 $ * \author Ralf Klueber, Lars von Wedel, Andreas Kellner - * \author Responsible author: $Author: LarsAC $ + * \author Responsible author: $Author: lvw $ * - * $Id: vdr_menu.c,v 1.26 2004/07/27 06:57:35 LarsAC Exp $ + * $Id: vdr_menu.c,v 1.27 2004/07/27 20:50:54 lvw Exp $ */ #include <string> @@ -784,7 +784,8 @@ eOSState mgMainMenu::PlaylistSubmenuAction( int n ) } break; case 5: { - string m3u_file = AddDirectory( cPlugin::ConfigDirectory("muggle"), m_current_playlist->getListname().c_str() ); + string m3u_file = AddDirectory( cPlugin::ConfigDirectory("muggle"), + m_current_playlist->getListname().c_str() ); m_current_playlist->exportM3U( m3u_file ); } break; case 6: @@ -909,6 +910,9 @@ void mgMainMenu::Play(mgPlaylist *plist) /************************************************************ * * $Log: vdr_menu.c,v $ + * Revision 1.27 2004/07/27 20:50:54 lvw + * Playlist indexing now working + * * Revision 1.26 2004/07/27 06:57:35 LarsAC * Inserted missing break * diff --git a/vdr_player.c b/vdr_player.c index bc790f4..105072b 100644 --- a/vdr_player.c +++ b/vdr_player.c @@ -2,12 +2,12 @@ * \file vdr_player.c * \brief A generic PCM player for a VDR media plugin (muggle) * - * \version $Revision: 1.6 $ - * \date $Date: 2004/07/26 22:20:55 $ + * \version $Revision: 1.7 $ + * \date $Date: 2004/07/27 20:50:54 $ * \author Ralf Klueber, Lars von Wedel, Andreas Kellner * \author Responsible author: $Author: lvw $ * - * $Id: vdr_player.c,v 1.6 2004/07/26 22:20:55 lvw Exp $ + * $Id: vdr_player.c,v 1.7 2004/07/27 20:50:54 lvw Exp $ * * Adapted from * MP3/MPlayer plugin to VDR (C++) @@ -247,7 +247,7 @@ void mgPCMPlayer::Activate(bool on) Lock(); m_playlist->initialize(); - NextFile(); + m_current = m_playlist->getCurrent(); Play(); Unlock(); @@ -1050,6 +1050,9 @@ eOSState mgPlayerControl::ProcessKey(eKeys key) /************************************************************ * * $Log: vdr_player.c,v $ + * Revision 1.7 2004/07/27 20:50:54 lvw + * Playlist indexing now working + * * Revision 1.6 2004/07/26 22:20:55 lvw * Reworked playlist indexing * |