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

[ib]

Author: ib
Date: Tue Sep  8 23:02:25 2015
New Revision: 37514

Log:
Merge r37498 from trunk:

Replace uiSetFile() by uiSetFileFromPlaylist() where necessary.

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:22 2015	(r37513)
+++ branches/1.2/gui/interface.c	Tue Sep  8 23:02:25 2015	(r37514)
@@ -982,7 +982,7 @@ int gui(int what, void *data)
         }
 
         if (next) {
-            uiSetFile(next->path, next->name, STREAMTYPE_FILE);
+            uiSetFileFromPlaylist(next);
             guiInfo.MediumChanged = GUI_MEDIUM_NEW;
             guiInfo.Track = (uintptr_t)listMgr(PLAYLIST_ITEM_GET_POS, next);
         } else {
@@ -998,7 +998,7 @@ int gui(int what, void *data)
                     uiUnsetFile();
                 else if ((curr != listMgr(PLAYLIST_GET, 0)) && guiInfo.Playing) {
                     curr = listMgr(PLAYLIST_ITEM_SET_CURR, listMgr(PLAYLIST_GET, 0));
-                    uiSetFile(curr->path, curr->name, STREAMTYPE_FILE);
+                    uiSetFileFromPlaylist(curr);
                     guiInfo.Track = 1;
                 }
             } else if (guiInfo.Playing) {

Modified: branches/1.2/gui/ui/actions.c
==============================================================================
--- branches/1.2/gui/ui/actions.c	Tue Sep  8 23:02:22 2015	(r37513)
+++ branches/1.2/gui/ui/actions.c	Tue Sep  8 23:02:25 2015	(r37514)
@@ -818,7 +818,7 @@ void uiCurr(void)
         curr = listMgr(PLAYLIST_ITEM_GET_CURR, 0);
 
         if (curr) {
-            uiSetFile(curr->path, curr->name, STREAMTYPE_FILE);
+            uiSetFileFromPlaylist(curr);
             guiInfo.PlaylistNext = False;
             guiInfo.Track = (uintptr_t)listMgr(PLAYLIST_ITEM_GET_POS, curr);
             break;
@@ -897,7 +897,7 @@ void uiPrev(void)
         prev = listMgr(PLAYLIST_ITEM_GET_PREV, 0);
 
         if (prev) {
-            uiSetFile(prev->path, prev->name, STREAMTYPE_FILE);
+            uiSetFileFromPlaylist(prev);
             guiInfo.PlaylistNext = !guiInfo.Playing;
             guiInfo.Track = (uintptr_t)listMgr(PLAYLIST_ITEM_GET_POS, prev);
             break;
@@ -966,7 +966,7 @@ void uiNext(void)
         next = listMgr(PLAYLIST_ITEM_GET_NEXT, 0);
 
         if (next) {
-            uiSetFile(next->path, next->name, STREAMTYPE_FILE);
+            uiSetFileFromPlaylist(next);
             guiInfo.PlaylistNext = !guiInfo.Playing;
             guiInfo.Track = (uintptr_t)listMgr(PLAYLIST_ITEM_GET_POS, next);
             break;