Changeset d955438ae787d20d3e2f41bb84038e5d96c16f3e
- Timestamp:
- 04/07/08 00:32:30
(5 months ago)
- Author:
- Rafaël Carré <funman@videolan.org>
- git-committer:
- Rafaël Carré <funman@videolan.org> 1207521150 +0200
- git-parent:
[423e5997ef970cee59b9e0b5bb8ee1dbe36d2b3b]
- git-author:
- Rafaël Carré <funman@videolan.org> 1207521055 +0200
- Message:
Remove hack : input items are now correctly dereferenced in the xspf demux
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| ree0a4d8 |
rd955438 |
|
| 397 | 397 | } |
|---|
| 398 | 398 | |
|---|
| 399 | | static void recursively_decref( playlist_item_t *p_node ) |
|---|
| 400 | | { |
|---|
| 401 | | vlc_gc_decref( p_node->p_input ); |
|---|
| 402 | | |
|---|
| 403 | | int i; |
|---|
| 404 | | if( p_node->i_children > 0 ) |
|---|
| 405 | | for( i = 0 ; i < p_node->i_children ; i++ ) |
|---|
| 406 | | recursively_decref( p_node->pp_children[i] ); |
|---|
| 407 | | } |
|---|
| 408 | | |
|---|
| 409 | 399 | /** |
|---|
| 410 | 400 | * Last loop |
|---|
| … | … | |
| 485 | 475 | } |
|---|
| 486 | 476 | |
|---|
| 487 | | if( config_GetInt( p_playlist, "media-library" ) ) |
|---|
| 488 | | { |
|---|
| 489 | | playlist_MLDump( p_playlist ); |
|---|
| 490 | | /* Because this recursive function decreases the |
|---|
| 491 | | * p_playlist->p_ml_category refcount, it may get deleted. |
|---|
| 492 | | * However we will delete the p_playlist->p_ml_category in the |
|---|
| 493 | | * following FOREACH. */ |
|---|
| 494 | | vlc_gc_incref( p_playlist->p_ml_category->p_input ); |
|---|
| 495 | | |
|---|
| 496 | | /* We don't need the media library anymore */ |
|---|
| 497 | | /* Decref all subitems, and the given items */ |
|---|
| 498 | | recursively_decref( p_playlist->p_ml_category ); |
|---|
| 499 | | } |
|---|
| | 477 | playlist_MLDump( p_playlist ); |
|---|
| 500 | 478 | |
|---|
| 501 | 479 | PL_LOCK; |
|---|