[MPlayer-cvslog] r34769 - in trunk/gui: cfg.c interface.c ui/gtk/playlist.c ui/main.c util/list.c util/list.h

[ib]

Author: ib
Date: Thu Feb 23 14:23:54 2012
New Revision: 34769

Log:
Rename PLAYLIST_ITEM_ADD PLAYLIST_ITEM_APPEND.

It is different from URLLIST_ITEM_ADD, so choose a different name.

Modified:
   trunk/gui/cfg.c
   trunk/gui/interface.c
   trunk/gui/ui/gtk/playlist.c
   trunk/gui/ui/main.c
   trunk/gui/util/list.c
   trunk/gui/util/list.h

Modified: trunk/gui/cfg.c
==============================================================================
--- trunk/gui/cfg.c	Thu Feb 23 14:15:47 2012	(r34768)
+++ trunk/gui/cfg.c	Thu Feb 23 14:23:54 2012	(r34769)
@@ -291,7 +291,7 @@ void cfg_read(void)
 
             if (fgetstr(line, sizeof(line), file) && *line) {
                 item->name = strdup(line);
-                listMgr(PLAYLIST_ITEM_ADD, item);
+                listMgr(PLAYLIST_ITEM_APPEND, item);
             } else {
                 free(item->path);
                 free(item);

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Thu Feb 23 14:15:47 2012	(r34768)
+++ trunk/gui/interface.c	Thu Feb 23 14:23:54 2012	(r34769)
@@ -856,7 +856,7 @@ static int import_file_into_gui(char *te
     if (insert)
         listMgr(PLAYLIST_ITEM_INSERT, item);           // inserts the item after current, and makes current=item
     else
-        listMgr(PLAYLIST_ITEM_ADD, item);
+        listMgr(PLAYLIST_ITEM_APPEND, item);
 
     return 1;
 }

Modified: trunk/gui/ui/gtk/playlist.c
==============================================================================
--- trunk/gui/ui/gtk/playlist.c	Thu Feb 23 14:15:47 2012	(r34768)
+++ trunk/gui/ui/gtk/playlist.c	Thu Feb 23 14:23:54 2012	(r34769)
@@ -205,7 +205,7 @@ static void plButtonReleased( GtkButton 
 	  if ( !item->name ) item->name = strdup( text[0] );
 	  item->path=g_filename_from_utf8( text[1], -1, NULL, NULL, NULL );
 	  if ( !item->path ) item->path = strdup( text[1] );
-	  listMgr( PLAYLIST_ITEM_ADD,item );
+	  listMgr( PLAYLIST_ITEM_APPEND,item );
 	 }
 	item = listMgr( PLAYLIST_ITEM_GET_CURR,0 );
 	if ( item )

Modified: trunk/gui/ui/main.c
==============================================================================
--- trunk/gui/ui/main.c	Thu Feb 23 14:15:47 2012	(r34768)
+++ trunk/gui/ui/main.c	Thu Feb 23 14:23:54 2012	(r34769)
@@ -657,7 +657,7 @@ void uiDandDHandler(int num,char** files
 	item->name = strdup(str);
 	item->path = strdup("");
       }
-      listMgr(PLAYLIST_ITEM_ADD,item);
+      listMgr(PLAYLIST_ITEM_APPEND,item);
     } else {
       mp_msg( MSGT_GPLAYER,MSGL_WARN,MSGTR_NotAFile,str );
     }

Modified: trunk/gui/util/list.c
==============================================================================
--- trunk/gui/util/list.c	Thu Feb 23 14:15:47 2012	(r34768)
+++ trunk/gui/util/list.c	Thu Feb 23 14:23:54 2012	(r34769)
@@ -39,7 +39,7 @@ void *listMgr(int cmd, void *data)
 
         return plList;
 
-    case PLAYLIST_ITEM_ADD:
+    case PLAYLIST_ITEM_APPEND:
 
         if (plList) {
             plItem *item = plList;
@@ -72,7 +72,7 @@ void *listMgr(int cmd, void *data)
 
             return plCurrent;
         } else
-            return listMgr(PLAYLIST_ITEM_ADD, pdat);
+            return listMgr(PLAYLIST_ITEM_APPEND, pdat);
 
     case PLAYLIST_ITEM_GET_NEXT:
 

Modified: trunk/gui/util/list.h
==============================================================================
--- trunk/gui/util/list.h	Thu Feb 23 14:15:47 2012	(r34768)
+++ trunk/gui/util/list.h	Thu Feb 23 14:23:54 2012	(r34769)
@@ -22,7 +22,7 @@
 /// listMgr() commands
 enum {
     PLAYLIST_GET,
-    PLAYLIST_ITEM_ADD,
+    PLAYLIST_ITEM_APPEND,
     PLAYLIST_ITEM_INSERT,
     PLAYLIST_ITEM_SET_CURR,
     PLAYLIST_ITEM_GET_CURR,