Changeset 1a3b1a8f27df60a72615dfc1e18423ab5cf02a5e
- Timestamp:
- 20/09/08 22:43:22
(2 months ago)
- Author:
- Antoine Cellerier <dionoea@videolan.org>
- git-committer:
- Antoine Cellerier <dionoea@videolan.org> 1221943402 +0200
- git-parent:
[aeb8ac0199a5924a357414284ef119f868808022]
- git-author:
- Antoine Cellerier <dionoea@videolan.org> 1221943402 +0200
- Message:
Remove last occurences of yield in the code and comments.
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r8f83ef4 |
r1a3b1a8 |
|
| 79 | 79 | video_format_t fmt; |
|---|
| 80 | 80 | } ass_handle_t; |
|---|
| 81 | | static ass_handle_t *AssHandleYield( decoder_t *p_dec ); |
|---|
| | 81 | static ass_handle_t *AssHandleHold( decoder_t *p_dec ); |
|---|
| 82 | 82 | static void AssHandleRelease( ass_handle_t * ); |
|---|
| 83 | 83 | |
|---|
| … | … | |
| 99 | 99 | }; |
|---|
| 100 | 100 | static void DecSysRelease( decoder_sys_t *p_sys ); |
|---|
| 101 | | static void DecSysYield( decoder_sys_t *p_sys ); |
|---|
| | 101 | static void DecSysHold( decoder_sys_t *p_sys ); |
|---|
| 102 | 102 | |
|---|
| 103 | 103 | struct subpicture_sys_t |
|---|
| … | … | |
| 141 | 141 | |
|---|
| 142 | 142 | /* */ |
|---|
| 143 | | p_sys->p_ass = AssHandleYield( p_dec ); |
|---|
| | 143 | p_sys->p_ass = AssHandleHold( p_dec ); |
|---|
| 144 | 144 | if( !p_sys->p_ass ) |
|---|
| 145 | 145 | { |
|---|
| … | … | |
| 175 | 175 | } |
|---|
| 176 | 176 | |
|---|
| 177 | | static void DecSysYield( decoder_sys_t *p_sys ) |
|---|
| | 177 | static void DecSysHold( decoder_sys_t *p_sys ) |
|---|
| 178 | 178 | { |
|---|
| 179 | 179 | vlc_mutex_lock( &p_sys->lock ); |
|---|
| … | … | |
| 291 | 291 | p_spu->p_sys->p_dec_sys = p_sys; |
|---|
| 292 | 292 | |
|---|
| 293 | | DecSysYield( p_sys ); |
|---|
| | 293 | DecSysHold( p_sys ); |
|---|
| 294 | 294 | |
|---|
| 295 | 295 | block_Release( p_block ); |
|---|
| … | … | |
| 631 | 631 | |
|---|
| 632 | 632 | /* */ |
|---|
| 633 | | static ass_handle_t *AssHandleYield( decoder_t *p_dec ) |
|---|
| | 633 | static ass_handle_t *AssHandleHold( decoder_t *p_dec ) |
|---|
| 634 | 634 | { |
|---|
| 635 | 635 | vlc_mutex_t *p_lock = var_AcquireMutex( "libass" ); |
|---|
| rba6501f |
r1a3b1a8 |
|
| 81 | 81 | /* Define the Input used. |
|---|
| 82 | 82 | Add the callbacks on input |
|---|
| 83 | | p_input is yield once here */ |
|---|
| | 83 | p_input is held once here */ |
|---|
| 84 | 84 | void InputManager::setInput( input_thread_t *_p_input ) |
|---|
| 85 | 85 | { |
|---|
| ra77e240 |
r1a3b1a8 |
|
| 664 | 664 | } |
|---|
| 665 | 665 | |
|---|
| 666 | | /* This item hasn't been yield by input_GetItem |
|---|
| | 666 | /* This item hasn't been held by input_GetItem |
|---|
| 667 | 667 | * don't release it */ |
|---|
| 668 | 668 | p_parent_input = input_GetItem( p_input ); |
|---|
| rba6501f |
r1a3b1a8 |
|
| 653 | 653 | /* Remember that we cannot hold the spin while waiting on the mutex */ |
|---|
| 654 | 654 | vlc_mutex_lock( &structure_lock ); |
|---|
| 655 | | /* Take the spin again. Note that another thread may have yielded the |
|---|
| | 655 | /* Take the spin again. Note that another thread may have held the |
|---|
| 656 | 656 | * object in the (very short) mean time. */ |
|---|
| 657 | 657 | vlc_spin_lock( &internals->ref_spin ); |
|---|
| r7060dbb |
r1a3b1a8 |
|
| 541 | 541 | } |
|---|
| 542 | 542 | |
|---|
| 543 | | /* We can release the list, interesting modules were yielded */ |
|---|
| | 543 | /* We can release the list, interesting modules were held */ |
|---|
| 544 | 544 | vlc_list_release( p_all ); |
|---|
| 545 | 545 | |
|---|
| rba6501f |
r1a3b1a8 |
|
| 49 | 49 | pl = libvlc_priv (p_this->p_libvlc)->p_playlist; |
|---|
| 50 | 50 | |
|---|
| 51 | | assert( VLC_OBJECT(pl) != p_this /* This does not make sense to yield the playlist |
|---|
| | 51 | assert( VLC_OBJECT(pl) != p_this /* This does not make sense to hold the playlist |
|---|
| 52 | 52 | using pl_Hold. use vlc_object_hold in this case */ ); |
|---|
| 53 | 53 | |
|---|