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

[ib]

Author: ib
Date: Tue Jul  5 17:04:00 2011
New Revision: 33822

Log:
Rename GUI playtree import functions.

Rename import_initial_playtree_into_gui() guiInitializePlaylist() and
import_playtree_playlist_into_gui() guiAddPlaylist().

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	Tue Jul  5 16:00:18 2011	(r33821)
+++ trunk/gui/interface.c	Tue Jul  5 17:04:00 2011	(r33822)
@@ -1411,7 +1411,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 import_initial_playtree_into_gui(play_tree_t *my_playtree, m_config_t *config, int enqueue)
+int guiInitializePlaylist(play_tree_t *my_playtree, m_config_t *config, int enqueue)
 {
     play_tree_iter_t *my_pt_iter = NULL;
     int result = 0;
@@ -1442,7 +1442,7 @@ int import_initial_playtree_into_gui(pla
 // 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 import_playtree_playlist_into_gui(play_tree_t *my_playtree, m_config_t *config)
+int guiAddPlaylist(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	Tue Jul  5 16:00:18 2011	(r33821)
+++ trunk/gui/interface.h	Tue Jul  5 17:04:00 2011	(r33822)
@@ -237,7 +237,7 @@ int gui(int what, void *arg);
 void guiInit(void);
 void guiLoadFont(void);
 void guiLoadSubtitle(char *name);
-int import_initial_playtree_into_gui(play_tree_t *my_playtree, m_config_t *config, int enqueue);
-int import_playtree_playlist_into_gui(play_tree_t *my_playtree, m_config_t *config);
+int guiInitializePlaylist(play_tree_t *my_playtree, m_config_t *config, int enqueue);
+int guiAddPlaylist(play_tree_t *my_playtree, m_config_t *config);
 
 #endif /* MPLAYER_GUI_INTERFACE_H */

Modified: trunk/gui/win32/interface.c
==============================================================================
--- trunk/gui/win32/interface.c	Tue Jul  5 16:00:18 2011	(r33821)
+++ trunk/gui/win32/interface.c	Tue Jul  5 17:04:00 2011	(r33822)
@@ -84,7 +84,7 @@ int parse_filename(char *file, play_tree
     if(strstr(file, ".m3u") || strstr(file, ".pls"))
     {
         playtree = parse_playlist_file(file);
-        import_playtree_playlist_into_gui(playtree, mconfig);
+        guiAddPlaylist(playtree, mconfig);
         return 1;
     }
     return 0;
@@ -782,7 +782,7 @@ static int import_file_into_gui(char *pa
     by either:
     - overwriting gui pl (enqueue=0) */
 
-int import_initial_playtree_into_gui(play_tree_t *my_playtree, m_config_t *config, int enqueue)
+int guiInitializePlaylist(play_tree_t *my_playtree, m_config_t *config, int enqueue)
 {
     play_tree_iter_t *my_pt_iter = NULL;
     int result = 0;
@@ -813,7 +813,7 @@ int import_initial_playtree_into_gui(pla
    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 import_playtree_playlist_into_gui(play_tree_t *my_playtree, m_config_t *config)
+int guiAddPlaylist(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	Tue Jul  5 16:00:18 2011	(r33821)
+++ trunk/mplayer.c	Tue Jul  5 17:04:00 2011	(r33822)
@@ -1042,7 +1042,7 @@ static int playtree_add_playlist(play_tr
 #ifdef CONFIG_GUI
     if (use_gui) {
         if (entry) {
-            import_playtree_playlist_into_gui(entry, mconfig);
+            guiAddPlaylist(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.
-        import_initial_playtree_into_gui(mpctx->playtree, mconfig, enqueue);
+        guiInitializePlaylist(mpctx->playtree, mconfig, enqueue);
     }
 #endif /* CONFIG_GUI */