comparison gui/win32/interface.c @ 35512:ce2cda8acb4e

Cosmetic: Change variable names.
author ib
date Wed, 05 Dec 2012 12:08:12 +0000
parents 6616645f91ea
children ecbaf301748f
comparison
equal deleted inserted replaced
35511:6616645f91ea 35512:ce2cda8acb4e
840 } 840 }
841 841
842 return 0; 842 return 0;
843 } 843 }
844 844
845 int guiPlaylist (int what, play_tree_t *my_playtree, m_config_t *config, int enqueue) 845 int guiPlaylist (int what, play_tree_t *playtree, m_config_t *config, int enqueue)
846 { 846 {
847 play_tree_iter_t *my_pt_iter = NULL; 847 play_tree_iter_t *pt_iter = NULL;
848 int added = FALSE; 848 int added = FALSE;
849 849
850 switch (what) 850 switch (what)
851 { 851 {
852 /* This function imports the initial playtree (based on cmd-line files) into the gui playlist 852 /* This function imports the initial playtree (based on cmd-line files) into the gui playlist
854 - overwriting gui pl (enqueue=0) */ 854 - overwriting gui pl (enqueue=0) */
855 case GUI_PLAYLIST_INIT: 855 case GUI_PLAYLIST_INIT:
856 856
857 if(!mygui) guiInit(); 857 if(!mygui) guiInit();
858 858
859 if((my_pt_iter = pt_iter_create(&my_playtree, config))) 859 if((pt_iter = pt_iter_create(&playtree, config)))
860 { 860 {
861 while ((filename = pt_iter_get_next_file(my_pt_iter)) != NULL) 861 while ((filename = pt_iter_get_next_file(pt_iter)) != NULL)
862 { 862 {
863 if (parse_filename(filename, my_playtree, config, 0)) 863 if (parse_filename(filename, playtree, config, 0))
864 added = TRUE; 864 added = TRUE;
865 else if (import_file_into_gui(filename, 0)) /* Add it to end of list */ 865 else if (import_file_into_gui(filename, 0)) /* Add it to end of list */
866 added = TRUE; 866 added = TRUE;
867 } 867 }
868 } 868 }
881 /* This function imports and inserts an playtree, that is created "on the fly", for example by 881 /* This function imports and inserts an playtree, that is created "on the fly", for example by
882 parsing some MOV-Reference-File; or by loading an playlist with "File Open" 882 parsing some MOV-Reference-File; or by loading an playlist with "File Open"
883 The file which contained the playlist is thereby replaced with it's contents. */ 883 The file which contained the playlist is thereby replaced with it's contents. */
884 case GUI_PLAYLIST_ADD: 884 case GUI_PLAYLIST_ADD:
885 885
886 if((my_pt_iter = pt_iter_create(&my_playtree, config))) 886 if((pt_iter = pt_iter_create(&playtree, config)))
887 { 887 {
888 while ((filename = pt_iter_get_next_file(my_pt_iter)) != NULL) 888 while ((filename = pt_iter_get_next_file(pt_iter)) != NULL)
889 if (import_file_into_gui(filename, 1)) /* insert it into the list and set plCurrent = new item */ 889 if (import_file_into_gui(filename, 1)) /* insert it into the list and set plCurrent = new item */
890 added = TRUE; 890 added = TRUE;
891 pt_iter_destroy(&my_pt_iter); 891 pt_iter_destroy(&pt_iter);
892 } 892 }
893 893
894 break; 894 break;
895 } 895 }
896 896