Changeset e60de0fefff4111294264467d013825cb8ac6d13
- Timestamp:
- 25/02/07 15:34:14
(2 years ago)
- Author:
- Laurent Aimar <fenrir@videolan.org>
- git-committer:
- Laurent Aimar <fenrir@videolan.org> 1172414054 +0000
- git-parent:
[617726b6c72b9677fb2f6e432c3e515bc197bbc1]
- git-author:
- Laurent Aimar <fenrir@videolan.org> 1172414054 +0000
- Message:
Fixed double input_thread_t free for VOD.
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r99aeeff |
re60de0f |
|
| 2487 | 2487 | |
|---|
| 2488 | 2488 | if( !p_instance->p_input || |
|---|
| 2489 | | ( !p_instance->p_input->b_eof && |
|---|
| 2490 | | !p_instance->p_input->b_error ) ) continue; |
|---|
| 2491 | | |
|---|
| 2492 | | input_StopThread( p_instance->p_input ); |
|---|
| 2493 | | input_DestroyThread( p_instance->p_input ); |
|---|
| | 2489 | ( !p_instance->p_input->b_eof && !p_instance->p_input->b_error ) ) |
|---|
| | 2490 | continue; |
|---|
| 2494 | 2491 | |
|---|
| 2495 | 2492 | p_instance->i_index++; |
|---|
| 2496 | | if( p_instance->i_index == p_media->i_input && |
|---|
| 2497 | | p_media->b_loop ) p_instance->i_index = 0; |
|---|
| | 2493 | if( p_instance->i_index >= p_media->i_input && p_media->b_loop ) |
|---|
| | 2494 | p_instance->i_index = 0; |
|---|
| 2498 | 2495 | |
|---|
| 2499 | 2496 | if( p_instance->i_index < p_media->i_input ) |
|---|
| 2500 | 2497 | { |
|---|
| | 2498 | char buffer[12]; |
|---|
| | 2499 | |
|---|
| | 2500 | input_StopThread( p_instance->p_input ); |
|---|
| | 2501 | input_DestroyThread( p_instance->p_input ); |
|---|
| | 2502 | p_instance->p_input = NULL; |
|---|
| | 2503 | |
|---|
| 2501 | 2504 | /* FIXME, find a way to select the right instance */ |
|---|
| 2502 | | char buffer[12]; |
|---|
| 2503 | 2505 | sprintf( buffer, "%d", p_instance->i_index+1 ); |
|---|
| | 2506 | |
|---|
| 2504 | 2507 | vlm_MediaControl( vlm, p_media, p_instance->psz_name, |
|---|
| 2505 | 2508 | "play", buffer ); |
|---|