# HG changeset patch # User diego # Date 1185632875 0 # Node ID 4d936284a5ecf8b58d8b60cb2c751acb79b0f28e # Parent 426c20bcfddfd96dcba16b3d07b41b9057f8af7d typo fix: childs --> children diff -r 426c20bcfddf -r 4d936284a5ec playtree.c --- a/playtree.c Sat Jul 28 14:27:04 2007 +0000 +++ b/playtree.c Sat Jul 28 14:27:55 2007 +0000 @@ -28,14 +28,14 @@ } void -play_tree_free(play_tree_t* pt, int childs) { +play_tree_free(play_tree_t* pt, int children) { play_tree_t* iter; #ifdef MP_DEBUG assert(pt != NULL); #endif - if(childs) { + if(children) { for(iter = pt->child; iter != NULL; ) { play_tree_t* nxt=iter->next; play_tree_free(iter,1); @@ -61,7 +61,7 @@ } void -play_tree_free_list(play_tree_t* pt, int childs) { +play_tree_free_list(play_tree_t* pt, int children) { play_tree_t* iter; #ifdef MP_DEBUG @@ -73,7 +73,7 @@ while(iter) { play_tree_t* nxt = iter->next; - play_tree_free(iter,childs); + play_tree_free(iter, children); iter = nxt; } @@ -149,7 +149,7 @@ } void -play_tree_remove(play_tree_t* pt, int free_it,int with_childs) { +play_tree_remove(play_tree_t* pt, int free_it, int with_children) { #ifdef MP_DEBUG assert(pt != NULL); @@ -191,7 +191,7 @@ pt->prev = pt->next = pt->parent = NULL; if(free_it) - play_tree_free(pt,with_childs); + play_tree_free(pt,with_children); } @@ -204,7 +204,7 @@ assert(pt->entry_type == PLAY_TREE_ENTRY_NODE); #endif - //DEBUG_FF: Where are the childs freed ? + //DEBUG_FF: Where are the children freed? // Attention in using this function! for(iter = pt->child ; iter != NULL ; iter = iter->next) iter->parent = NULL; @@ -405,7 +405,7 @@ } -// all childs if deep < 0 +// all children if deep < 0 void play_tree_set_flag(play_tree_t* pt, int flags , int deep) { play_tree_t* i; @@ -614,7 +614,7 @@ } - // Is there any valid childs ? + // Is there any valid child? if(pt->child && play_tree_is_valid(pt->child)) { iter->tree = pt; if(with_nodes) { // Stop on the node @@ -623,7 +623,7 @@ return play_tree_iter_down_step(iter,d,with_nodes); } - // Is it a valid enty ? + // Is it a valid entry? if(! play_tree_is_valid(pt)) { if(d == 0) { // Can this happen ? FF: Yes! mp_msg(MSGT_PLAYTREE,MSGL_ERR,"What to do now ???? Infinite loop if we continue\n"); diff -r 426c20bcfddf -r 4d936284a5ec playtree.h --- a/playtree.h Sat Jul 28 14:27:04 2007 +0000 +++ b/playtree.h Sat Jul 28 14:27:55 2007 +0000 @@ -31,7 +31,7 @@ /// \defgroup PlaytreeEntryFlags Playtree flags /// \ingroup Playtree ///@{ -/// Play the item childs in random order. +/// Play the item children in random order. #define PLAY_TREE_RND (1<<0) /// Playtree flags used by the iterator to mark items already "randomly" played. #define PLAY_TREE_RND_PLAYED (1<<8) @@ -121,21 +121,21 @@ /// Free a playtree item. /** \param pt Item to free. - * \param childs If non-zero the item's childs are recursively freed. + * \param children If non-zero the item's children are recursively freed. */ void -play_tree_free(play_tree_t* pt, int childs); +play_tree_free(play_tree_t* pt, int children); /// Free an item and its siblings. /** \param pt Item to free. - * \param childs If non-zero the items' childs are recursively freed. + * \param children If non-zero the items' children are recursively freed. */ void -play_tree_free_list(play_tree_t* pt, int childs); +play_tree_free_list(play_tree_t* pt, int children); -/// Set the childs of a playtree item. +/// Set the children of a playtree item. void play_tree_set_child(play_tree_t* pt, play_tree_t* child); @@ -158,7 +158,7 @@ /// Detach an item from the tree. void -play_tree_remove(play_tree_t* pt, int free_it,int with_childs); +play_tree_remove(play_tree_t* pt, int free_it,int with_children); /// Add a file to an item. void @@ -199,7 +199,7 @@ /// Step an iterator. /** \param iter The iterator. * \param d The direction: d > 0 == next , d < 0 == prev - * \param with_node TRUE == stop on nodes with childs, FALSE == go directly to the next child + * \param with_node TRUE == stop on nodes with children, FALSE == go directly to the next child * \return See \ref PlaytreeIterReturn. */ int @@ -208,7 +208,7 @@ /// Step up, useful to break a loop, etc. /** \param iter The iterator. * \param d The direction: d > 0 == next , d < 0 == prev - * \param with_node TRUE == stop on nodes with childs, FALSE == go directly to the next child + * \param with_node TRUE == stop on nodes with children, FALSE == go directly to the next child * \return See \ref PlaytreeIterReturn. */ int