[MPlayer-cvslog] r33840 - in trunk: gui/interface.c gui/interface.h gui/win32/interface.c mplayer.c

[ib]

Author: ib
Date: Thu Jul  7 16:54:53 2011
New Revision: 33840

Log:
Cosmetic: Rename the GUI playlist functions.

Rename guiInitializePlaylist() guiPlaylistInitialize()
and guiAddPlaylist() guiPlaylistAdd().

Modified:
   trunk/gui/interface.c
   trunk/gui/interface.h
   trunk/gui/win32/interface.c
   trunk/mplayer.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Thu Jul  7 16:47:48 2011	(r33839)
+++ trunk/gui/interface.c	Thu Jul  7 16:54:53 2011	(r33840)
@@ -867,7 +867,7 @@ static int import_file_into_gui(char *te
 // 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 @@ int guiInitializePlaylist(play_tree_t *m
 // 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;

Modified: trunk/gui/interface.h
==============================================================================
--- trunk/gui/interface.h	Thu Jul  7 16:47:48 2011	(r33839)
+++ trunk/gui/interface.h	Thu Jul  7 16:54:53 2011	(r33840)
@@ -179,8 +179,8 @@ extern guiInterface_t guiInfo;
 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 */
 

Modified: trunk/gui/win32/interface.c
==============================================================================
--- trunk/gui/win32/interface.c	Thu Jul  7 16:47:48 2011	(r33839)
+++ trunk/gui/win32/interface.c	Thu Jul  7 16:54:53 2011	(r33840)
@@ -84,7 +84,7 @@ int parse_filename(char *file, play_tree
     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 @@ static int import_file_into_gui(char *pa
     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 @@ int guiInitializePlaylist(play_tree_t *m
    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;

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Thu Jul  7 16:47:48 2011	(r33839)
+++ trunk/mplayer.c	Thu Jul  7 16:54:53 2011	(r33840)
@@ -1042,7 +1042,7 @@ static int playtree_add_playlist(play_tr
 #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 @@ int main(int argc, char *argv[])
             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 */