[MPlayer-cvslog] r33986 - in trunk/gui: interface.c ui/actions.c ui/main.c

[ib]

Author: ib
Date: Fri Aug 12 18:31:18 2011
New Revision: 33986

Log:
Provide track information for playlists.

The documentation says so.

Modified:
   trunk/gui/interface.c
   trunk/gui/ui/actions.c
   trunk/gui/ui/main.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Fri Aug 12 17:25:30 2011	(r33985)
+++ trunk/gui/interface.c	Fri Aug 12 18:31:18 2011	(r33986)
@@ -790,6 +790,7 @@ int gui(int what, void *data)
             guiInfo.NewPlay    = GUI_FILE_NEW;
             nfree(guiInfo.AudioFilename);
             nfree(guiInfo.SubtitleFilename);
+            guiInfo.Track++;
         } else {
             if (guiInfo.NewPlay == GUI_FILE_NEW)
                 break;

Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c	Fri Aug 12 17:25:30 2011	(r33985)
+++ trunk/gui/ui/actions.c	Fri Aug 12 18:31:18 2011	(r33986)
@@ -346,6 +346,7 @@ void uiPrev(void)
         if (prev) {
             uiSetFileName(prev->path, prev->name, STREAMTYPE_FILE);
             uiGotoTheNext = 0;
+            guiInfo.Track--;
             break;
         }
 
@@ -401,6 +402,7 @@ void uiNext(void)
         if (next) {
             uiSetFileName(next->path, next->name, STREAMTYPE_FILE);
             uiGotoTheNext = 0;
+            guiInfo.Track++;
             break;
         }
 

Modified: trunk/gui/ui/main.c
==============================================================================
--- trunk/gui/ui/main.c	Fri Aug 12 17:25:30 2011	(r33985)
+++ trunk/gui/ui/main.c	Fri Aug 12 18:31:18 2011	(r33986)
@@ -201,6 +201,8 @@ play:
 	  case STREAMTYPE_STREAM:
 	  case STREAMTYPE_FILE:
 	       guiInfoMediumClear( CLEAR_ALL - CLEAR_FILE );
+	       if ( !guiInfo.Track )
+	         guiInfo.Track=1;
 	       guiInfo.NewPlay=GUI_FILE_NEW;
 	       break;
 #ifdef CONFIG_VCD