Mercurial > mplayer.hg

changeset 33734:1fbe7adc4eaf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename GUI playtree import functions. Rename import_initial_playtree_into_gui() guiInitializePlaylist() and import_playtree_playlist_into_gui() guiAddPlaylist().
author ib
date Tue, 05 Jul 2011 15:04:00 +0000
parents 7458d793b38b
children 84defaf2e7f8
files gui/interface.c gui/interface.h gui/win32/interface.c mplayer.c
diffstat 4 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/gui/interface.c	Tue Jul 05 14:00:18 2011 +0000
+++ b/gui/interface.c	Tue Jul 05 15:04:00 2011 +0000
@@ -1411,7 +1411,7 @@
 // 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 @@
 // 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;
--- a/gui/interface.h	Tue Jul 05 14:00:18 2011 +0000
+++ b/gui/interface.h	Tue Jul 05 15:04:00 2011 +0000
@@ -237,7 +237,7 @@
 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 */
--- a/gui/win32/interface.c	Tue Jul 05 14:00:18 2011 +0000
+++ b/gui/win32/interface.c	Tue Jul 05 15:04:00 2011 +0000
@@ -84,7 +84,7 @@
     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 @@
     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 @@
    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;
--- a/mplayer.c	Tue Jul 05 14:00:18 2011 +0000
+++ b/mplayer.c	Tue Jul 05 15:04:00 2011 +0000
@@ -1042,7 +1042,7 @@
 #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 @@
             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 */