Mercurial > mplayer.hg
changeset 34681:42fa91951bd2
Rename PLAYLIST_ITEM_ADD PLAYLIST_ITEM_APPEND.
It is different from URLLIST_ITEM_ADD, so choose a different name.
| author | ib |
|---|---|
| date | Thu, 23 Feb 2012 13:23:54 +0000 |
| parents | f49f6501eb8b |
| children | c3ab7bd64ab3 |
| files | gui/cfg.c gui/interface.c gui/ui/gtk/playlist.c gui/ui/main.c gui/util/list.c gui/util/list.h |
| diffstat | 6 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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);
--- 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; }
--- 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 )
--- 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 ); }
--- 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: