[MPlayer-cvslog] r37520 - in branches/1.2: . gui/interface.c gui/ui/actions.c

[ib]

Author: ib
Date: Tue Sep  8 23:02:40 2015
New Revision: 37520

Log:
Merge r37504 from trunk:

Set guiInfo.Track information in uiSetFileFromPlaylist().

Modified:
   branches/1.2/   (props changed)
   branches/1.2/gui/interface.c
   branches/1.2/gui/ui/actions.c

Modified: branches/1.2/gui/interface.c
==============================================================================
--- branches/1.2/gui/interface.c	Tue Sep  8 23:02:37 2015	(r37519)
+++ branches/1.2/gui/interface.c	Tue Sep  8 23:02:40 2015	(r37520)
@@ -600,7 +600,6 @@ int gui(int what, void *data)
             } else {
                 next = listMgr(PLAYLIST_ITEM_GET_CURR, 0);
                 uiSetFileFromPlaylist(next);
-                guiInfo.Track = (uintptr_t)listMgr(PLAYLIST_ITEM_GET_POS, next);
             }
         }
         break;
@@ -1023,7 +1022,6 @@ int gui(int what, void *data)
         if (next) {
             uiSetFileFromPlaylist(next);
             guiInfo.MediumChanged = GUI_MEDIUM_NEW;
-            guiInfo.Track = (uintptr_t)listMgr(PLAYLIST_ITEM_GET_POS, next);
         } else {
             if (guiInfo.MediumChanged == GUI_MEDIUM_NEW)
                 break;

Modified: branches/1.2/gui/ui/actions.c
==============================================================================
--- branches/1.2/gui/ui/actions.c	Tue Sep  8 23:02:37 2015	(r37519)
+++ branches/1.2/gui/ui/actions.c	Tue Sep  8 23:02:40 2015	(r37520)
@@ -726,6 +726,7 @@ void uiSetFileFromPlaylist(plItem *item)
     guiInfo.Start = item->start;
     guiInfo.Stop  = item->stop;
     guiInfo.Title = gstrdup(item->title);
+    guiInfo.Track = (uintptr_t)listMgr(PLAYLIST_ITEM_GET_POS, item);
 }
 
 /**
@@ -820,7 +821,6 @@ void uiCurr(void)
         if (curr) {
             uiSetFileFromPlaylist(curr);
             guiInfo.PlaylistNext = False;
-            guiInfo.Track = (uintptr_t)listMgr(PLAYLIST_ITEM_GET_POS, curr);
             break;
         }
 
@@ -899,7 +899,6 @@ void uiPrev(void)
         if (prev) {
             uiSetFileFromPlaylist(prev);
             guiInfo.PlaylistNext = !guiInfo.Playing;
-            guiInfo.Track = (uintptr_t)listMgr(PLAYLIST_ITEM_GET_POS, prev);
             break;
         }
 
@@ -968,7 +967,6 @@ void uiNext(void)
         if (next) {
             uiSetFileFromPlaylist(next);
             guiInfo.PlaylistNext = !guiInfo.Playing;
-            guiInfo.Track = (uintptr_t)listMgr(PLAYLIST_ITEM_GET_POS, next);
             break;
         }