# HG changeset patch # User ib # Date 1330003434 0 # Node ID 42fa91951bd212ee96ba7f68646d496ce85074ac # Parent f49f6501eb8b6747396a7560cda3d8697ba057eb Rename PLAYLIST_ITEM_ADD PLAYLIST_ITEM_APPEND. It is different from URLLIST_ITEM_ADD, so choose a different name. diff -r f49f6501eb8b -r 42fa91951bd2 gui/cfg.c --- a/gui/cfg.c Thu Feb 23 13:15:47 2012 +0000 +++ b/gui/cfg.c Thu Feb 23 13:23:54 2012 +0000 @@ -291,7 +291,7 @@ 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); diff -r f49f6501eb8b -r 42fa91951bd2 gui/interface.c --- a/gui/interface.c Thu Feb 23 13:15:47 2012 +0000 +++ b/gui/interface.c Thu Feb 23 13:23:54 2012 +0000 @@ -856,7 +856,7 @@ 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; } diff -r f49f6501eb8b -r 42fa91951bd2 gui/ui/gtk/playlist.c --- a/gui/ui/gtk/playlist.c Thu Feb 23 13:15:47 2012 +0000 +++ b/gui/ui/gtk/playlist.c Thu Feb 23 13:23:54 2012 +0000 @@ -205,7 +205,7 @@ 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 ) diff -r f49f6501eb8b -r 42fa91951bd2 gui/ui/main.c --- a/gui/ui/main.c Thu Feb 23 13:15:47 2012 +0000 +++ b/gui/ui/main.c Thu Feb 23 13:23:54 2012 +0000 @@ -657,7 +657,7 @@ 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 ); } diff -r f49f6501eb8b -r 42fa91951bd2 gui/util/list.c --- a/gui/util/list.c Thu Feb 23 13:15:47 2012 +0000 +++ b/gui/util/list.c Thu Feb 23 13:23:54 2012 +0000 @@ -39,7 +39,7 @@ return plList; - case PLAYLIST_ITEM_ADD: + case PLAYLIST_ITEM_APPEND: if (plList) { plItem *item = plList; @@ -72,7 +72,7 @@ return plCurrent; } else - return listMgr(PLAYLIST_ITEM_ADD, pdat); + return listMgr(PLAYLIST_ITEM_APPEND, pdat); case PLAYLIST_ITEM_GET_NEXT: diff -r f49f6501eb8b -r 42fa91951bd2 gui/util/list.h --- a/gui/util/list.h Thu Feb 23 13:15:47 2012 +0000 +++ b/gui/util/list.h Thu Feb 23 13:23:54 2012 +0000 @@ -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,