Mercurial > mplayer.hg
diff gui/interface.c @ 34610:4ff933a89818
Cosmetic: Rename functions in list.c.
Additionally, change a parameter name of new listMgr()
and add some doxygen comments to list.h.
| author | ib |
|---|---|
| date | Sun, 12 Feb 2012 18:44:19 +0000 |
| parents | 19398061c204 |
| children | 5d6367c875c2 |
line wrap: on
line diff
--- a/gui/interface.c Sun Feb 12 18:39:27 2012 +0000 +++ b/gui/interface.c Sun Feb 12 18:44:19 2012 +0000 @@ -268,8 +268,8 @@ } appFreeStruct(); - listSet(gtkDelPl, NULL); - listSet(gtkDelURL, NULL); + listMgr(gtkDelPl, NULL); + listMgr(gtkDelURL, NULL); free(guiIcon.collection); if (gui_conf) { @@ -449,7 +449,7 @@ while (video_out_drivers[i++]) { if (video_out_drivers[i - 1]->control(VOCTRL_GUISUPPORT, NULL) == VO_TRUE) { - gaddlist(&video_driver_list, (char *)video_out_drivers[i - 1]->info->short_name); + listSet(&video_driver_list, (char *)video_out_drivers[i - 1]->info->short_name); break; } } @@ -487,10 +487,10 @@ // if ( ao_plugin_cfg.plugin_list ) { free( ao_plugin_cfg.plugin_list ); ao_plugin_cfg.plugin_list=NULL; } if (gtkAONorm) - greplace(&af_cfg.list, "volnorm", "volnorm"); + listRepl(&af_cfg.list, "volnorm", "volnorm"); if (gtkEnableAudioEqualizer) - greplace(&af_cfg.list, "equalizer", "equalizer"); + listRepl(&af_cfg.list, "equalizer", "equalizer"); if (gtkAOExtraStereo) { char *name; @@ -498,7 +498,7 @@ name = malloc(12 + 20 + 1); snprintf(name, 12 + 20, "extrastereo=%f", gtkAOExtraStereoMul); name[12 + 20] = 0; - greplace(&af_cfg.list, "extrastereo", name); + listRepl(&af_cfg.list, "extrastereo", name); free(name); } @@ -514,7 +514,7 @@ } else tmp = strdup("oss"); - gaddlist(&audio_driver_list, tmp); + listSet(&audio_driver_list, tmp); free(tmp); } @@ -530,7 +530,7 @@ } else tmp = strdup("alsa"); - gaddlist(&audio_driver_list, tmp); + listSet(&audio_driver_list, tmp); free(tmp); } @@ -543,7 +543,7 @@ } else tmp = strdup("sdl"); - gaddlist(&audio_driver_list, tmp); + listSet(&audio_driver_list, tmp); free(tmp); } @@ -556,7 +556,7 @@ } else tmp = strdup("esd"); - gaddlist(&audio_driver_list, tmp); + listSet(&audio_driver_list, tmp); free(tmp); } @@ -777,7 +777,7 @@ break; } - if (guiInfo.Playing && (next = listSet(gtkGetNextPlItem, NULL)) && (plLastPlayed != next)) { + if (guiInfo.Playing && (next = listMgr(gtkGetNextPlItem, NULL)) && (plLastPlayed != next)) { plLastPlayed = next; uiSetFileName(next->path, next->name, STREAMTYPE_FILE); guiInfo.NewPlay = GUI_FILE_NEW; @@ -858,9 +858,9 @@ item->path = pathname; if (insert) - listSet(gtkInsertPlItem, item); // inserts the item after current, and makes current=item + listMgr(gtkInsertPlItem, item); // inserts the item after current, and makes current=item else - listSet(gtkAddPlItem, item); + listMgr(gtkAddPlItem, item); return 1; } @@ -875,7 +875,7 @@ int result = 0; if (!enqueue) - listSet(gtkDelPl, NULL); // delete playlist before "appending" + listMgr(gtkDelPl, NULL); // delete playlist before "appending" if ((my_pt_iter = pt_iter_create(&my_playtree, config))) { while ((filename = pt_iter_get_next_file(my_pt_iter)) != NULL) @@ -904,7 +904,7 @@ int result = 0; plItem *save; - save = (plItem *)listSet(gtkGetCurrPlItem, NULL); // save current item + save = (plItem *)listMgr(gtkGetCurrPlItem, NULL); // save current item if ((my_pt_iter = pt_iter_create(&my_playtree, config))) { while ((filename = pt_iter_get_next_file(my_pt_iter)) != NULL) @@ -916,12 +916,12 @@ } if (save) - listSet(gtkSetCurrPlItem, save); + listMgr(gtkSetCurrPlItem, save); else - listSet(gtkSetCurrPlItem, plList); // go to head, if plList was empty before + listMgr(gtkSetCurrPlItem, plList); // go to head, if plList was empty before if (save && result) - listSet(gtkDelCurrPlItem, NULL); + listMgr(gtkDelCurrPlItem, NULL); uiCurr(); // update filename
