Changeset b2b9fb4c30858b5caa1d660c791c051ac8bacd87
- Timestamp:
- 05/03/08 19:11:28
(2 months ago)
- Author:
- Rémi Denis-Courmont <rem@videolan.org>
- git-committer:
- Rémi Denis-Courmont <rem@videolan.org> 1209834688 +0300
- git-parent:
[6d44cf441801dc76e4c61ddcb4d834cb3c4b4ab6]
- git-author:
- Rémi Denis-Courmont <rem@videolan.org> 1209834688 +0300
- Message:
block_FifoNew: remove un-needed parameter
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r189bc59 |
rb2b9fb4 |
|
| 272 | 272 | ****************************************************************************/ |
|---|
| 273 | 273 | |
|---|
| 274 | | #define block_FifoNew( a ) __block_FifoNew( VLC_OBJECT(a) ) |
|---|
| 275 | | VLC_EXPORT( block_fifo_t *, __block_FifoNew, ( vlc_object_t * ) ); |
|---|
| | 274 | VLC_EXPORT( block_fifo_t *, block_FifoNew, ( void ) ); |
|---|
| 276 | 275 | VLC_EXPORT( void, block_FifoRelease, ( block_fifo_t * ) ); |
|---|
| 277 | 276 | VLC_EXPORT( void, block_FifoEmpty, ( block_fifo_t * ) ); |
|---|
| rd1d3dc1 |
rb2b9fb4 |
|
| 147 | 147 | p_sys->p_thread->b_die = 0; |
|---|
| 148 | 148 | p_sys->p_thread->b_error= 0; |
|---|
| 149 | | p_sys->p_thread->p_fifo_media = block_FifoNew( p_access ); |
|---|
| 150 | | p_sys->p_thread->p_empty_blocks = block_FifoNew( p_access ); |
|---|
| | 149 | p_sys->p_thread->p_fifo_media = block_FifoNew(); |
|---|
| | 150 | p_sys->p_thread->p_empty_blocks = block_FifoNew(); |
|---|
| 151 | 151 | p_sys->p_thread->has_audio = 0; |
|---|
| 152 | 152 | p_sys->p_thread->has_video = 0; |
|---|
| rf94a2f9 |
rb2b9fb4 |
|
| 162 | 162 | |
|---|
| 163 | 163 | /* */ |
|---|
| 164 | | p_sys->p_fifo = block_FifoNew( p_access ); |
|---|
| | 164 | p_sys->p_fifo = block_FifoNew(); |
|---|
| 165 | 165 | p_sys->i_write_size = 0; |
|---|
| 166 | 166 | p_sys->i_files = 0; |
|---|
| r97897ee |
rb2b9fb4 |
|
| 222 | 222 | p_sys->p_thread->b_die = 0; |
|---|
| 223 | 223 | p_sys->p_thread->b_error= 0; |
|---|
| 224 | | p_sys->p_thread->p_fifo = block_FifoNew( p_access ); |
|---|
| 225 | | p_sys->p_thread->p_empty_blocks = block_FifoNew( p_access ); |
|---|
| | 224 | p_sys->p_thread->p_fifo = block_FifoNew(); |
|---|
| | 225 | p_sys->p_thread->p_empty_blocks = block_FifoNew(); |
|---|
| 226 | 226 | |
|---|
| 227 | 227 | i_handle = net_ConnectDgram( p_this, psz_dst_addr, i_dst_port, -1, |
|---|
| r97897ee |
rb2b9fb4 |
|
| 298 | 298 | p_vod->pf_media_del_es = MediaDelES; |
|---|
| 299 | 299 | |
|---|
| 300 | | p_sys->p_fifo_cmd = block_FifoNew( p_vod ); |
|---|
| | 300 | p_sys->p_fifo_cmd = block_FifoNew(); |
|---|
| 301 | 301 | if( vlc_thread_create( p_vod, "rtsp vod thread", CommandThread, |
|---|
| 302 | 302 | VLC_THREAD_PRIORITY_LOW, false ) ) |
|---|
| rd1d3dc1 |
rb2b9fb4 |
|
| 1163 | 1163 | p_sys->i_ttl, id->i_port, id->i_port + 1 ); |
|---|
| 1164 | 1164 | |
|---|
| 1165 | | id->p_fifo = block_FifoNew( p_stream ); |
|---|
| | 1165 | id->p_fifo = block_FifoNew(); |
|---|
| 1166 | 1166 | if( vlc_thread_create( id, "RTP send thread", ThreadSend, |
|---|
| 1167 | 1167 | VLC_THREAD_PRIORITY_HIGHEST, false ) ) |
|---|
| r77d07c4 |
rb2b9fb4 |
|
| 484 | 484 | |
|---|
| 485 | 485 | /* decoder fifo */ |
|---|
| 486 | | if( ( p_dec->p_owner->p_fifo = block_FifoNew( p_dec ) ) == NULL ) |
|---|
| | 486 | if( ( p_dec->p_owner->p_fifo = block_FifoNew() ) == NULL ) |
|---|
| 487 | 487 | { |
|---|
| 488 | 488 | msg_Err( p_dec, "out of memory" ); |
|---|
| rd1d3dc1 |
rb2b9fb4 |
|
| 338 | 338 | |
|---|
| 339 | 339 | /* decoder fifo */ |
|---|
| 340 | | if( ( p_sys->p_fifo = block_FifoNew( s ) ) == NULL ) |
|---|
| | 340 | if( ( p_sys->p_fifo = block_FifoNew() ) == NULL ) |
|---|
| 341 | 341 | { |
|---|
| 342 | 342 | msg_Err( s, "out of memory" ); |
|---|
| r6276fe0 |
rb2b9fb4 |
|
| 36 | 36 | block_FifoEmpty |
|---|
| 37 | 37 | block_FifoGet |
|---|
| 38 | | __block_FifoNew |
|---|
| | 38 | block_FifoNew |
|---|
| 39 | 39 | block_FifoPut |
|---|
| 40 | 40 | block_FifoRelease |
|---|
| r5365c58 |
rb2b9fb4 |
|
| 244 | 244 | }; |
|---|
| 245 | 245 | |
|---|
| 246 | | block_fifo_t *__block_FifoNew( vlc_object_t *p_obj ) |
|---|
| 247 | | { |
|---|
| 248 | | block_fifo_t *p_fifo; |
|---|
| 249 | | |
|---|
| 250 | | p_fifo = malloc( sizeof( block_fifo_t ) ); |
|---|
| 251 | | if( !p_fifo ) return NULL; |
|---|
| 252 | | vlc_mutex_init( p_obj, &p_fifo->lock ); |
|---|
| 253 | | vlc_cond_init( p_obj, &p_fifo->wait ); |
|---|
| | 246 | block_fifo_t *block_FifoNew( void ) |
|---|
| | 247 | { |
|---|
| | 248 | block_fifo_t *p_fifo = malloc( sizeof( block_fifo_t ) ); |
|---|
| | 249 | if( !p_fifo ) |
|---|
| | 250 | return NULL; |
|---|
| | 251 | |
|---|
| | 252 | vlc_mutex_init( NULL, &p_fifo->lock ); |
|---|
| | 253 | vlc_cond_init( NULL, &p_fifo->wait ); |
|---|
| 254 | 254 | p_fifo->p_first = NULL; |
|---|
| 255 | 255 | p_fifo->pp_last = &p_fifo->p_first; |
|---|
| rd1d3dc1 |
rb2b9fb4 |
|
| 531 | 531 | p_input->p_sout = p_mux->p_sout; |
|---|
| 532 | 532 | p_input->p_fmt = p_fmt; |
|---|
| 533 | | p_input->p_fifo = block_FifoNew( p_mux->p_sout ); |
|---|
| | 533 | p_input->p_fifo = block_FifoNew(); |
|---|
| 534 | 534 | p_input->p_sys = NULL; |
|---|
| 535 | 535 | |
|---|