# HG changeset patch # User ib # Date 1310050493 0 # Node ID 6cea6d268f97930b99f187ad7341a629e1459ae0 # Parent c28c967e40e937b55b9ccd192920aeb96eb8497e Cosmetic: Rename the GUI playlist functions. Rename guiInitializePlaylist() guiPlaylistInitialize() and guiAddPlaylist() guiPlaylistAdd(). diff -r c28c967e40e9 -r 6cea6d268f97 gui/interface.c --- a/gui/interface.c Thu Jul 07 14:47:48 2011 +0000 +++ b/gui/interface.c Thu Jul 07 14:54:53 2011 +0000 @@ -867,7 +867,7 @@ // into the gui playlist by either: // - overwriting gui pl (enqueue=0) // - appending it to gui pl (enqueue=1) -int guiInitializePlaylist(play_tree_t *my_playtree, m_config_t *config, int enqueue) +int guiPlaylistInitialize(play_tree_t *my_playtree, m_config_t *config, int enqueue) { play_tree_iter_t *my_pt_iter = NULL; int result = 0; @@ -898,7 +898,7 @@ // for example by parsing some MOV-Reference-File; or by loading an playlist // with "File Open". // The file which contained the playlist is thereby replaced with it's contents. -int guiAddPlaylist(play_tree_t *my_playtree, m_config_t *config) +int guiPlaylistAdd(play_tree_t *my_playtree, m_config_t *config) { play_tree_iter_t *my_pt_iter = NULL; int result = 0; diff -r c28c967e40e9 -r 6cea6d268f97 gui/interface.h --- a/gui/interface.h Thu Jul 07 14:47:48 2011 +0000 +++ b/gui/interface.h Thu Jul 07 14:54:53 2011 +0000 @@ -179,8 +179,8 @@ void guiDone(void); int gui(int what, void *arg); void guiInit(void); -int guiInitializePlaylist(play_tree_t *my_playtree, m_config_t *config, int enqueue); -int guiAddPlaylist(play_tree_t *my_playtree, m_config_t *config); +int guiPlaylistInitialize(play_tree_t *my_playtree, m_config_t *config, int enqueue); +int guiPlaylistAdd(play_tree_t *my_playtree, m_config_t *config); /* GUI -> MPlayer */ diff -r c28c967e40e9 -r 6cea6d268f97 gui/win32/interface.c --- a/gui/win32/interface.c Thu Jul 07 14:47:48 2011 +0000 +++ b/gui/win32/interface.c Thu Jul 07 14:54:53 2011 +0000 @@ -84,7 +84,7 @@ if(strstr(file, ".m3u") || strstr(file, ".pls")) { playtree = parse_playlist_file(file); - guiAddPlaylist(playtree, mconfig); + guiPlaylistAdd(playtree, mconfig); return 1; } return 0; @@ -795,7 +795,7 @@ by either: - overwriting gui pl (enqueue=0) */ -int guiInitializePlaylist(play_tree_t *my_playtree, m_config_t *config, int enqueue) +int guiPlaylistInitialize(play_tree_t *my_playtree, m_config_t *config, int enqueue) { play_tree_iter_t *my_pt_iter = NULL; int result = 0; @@ -826,7 +826,7 @@ parsing some MOV-Reference-File; or by loading an playlist with "File Open" The file which contained the playlist is thereby replaced with it's contents. */ -int guiAddPlaylist(play_tree_t *my_playtree, m_config_t *config) +int guiPlaylistAdd(play_tree_t *my_playtree, m_config_t *config) { play_tree_iter_t *my_pt_iter = NULL; int result = 0; diff -r c28c967e40e9 -r 6cea6d268f97 mplayer.c --- a/mplayer.c Thu Jul 07 14:47:48 2011 +0000 +++ b/mplayer.c Thu Jul 07 14:54:53 2011 +0000 @@ -1042,7 +1042,7 @@ #ifdef CONFIG_GUI if (use_gui) { if (entry) { - guiAddPlaylist(entry, mconfig); + guiPlaylistAdd(entry, mconfig); play_tree_free_list(entry, 1); } } else @@ -2855,7 +2855,7 @@ play_tree_add_bpf(mpctx->playtree, cwd); } // Import initital playtree into GUI. - guiInitializePlaylist(mpctx->playtree, mconfig, enqueue); + guiPlaylistInitialize(mpctx->playtree, mconfig, enqueue); } #endif /* CONFIG_GUI */