Changeset 91d170a11d8c8cd9880c2982102797e67f349814
- Timestamp:
- 01/10/08 19:11:55
(8 months ago)
- Author:
- Rémi Duraffort <ivoire@videolan.org>
- git-committer:
- Rémi Duraffort <ivoire@videolan.org> 1199988715 +0000
- git-parent:
[ab9b2674813f203463912f769b8f3b978d9bada9]
- git-author:
- Rémi Duraffort <ivoire@videolan.org> 1199988715 +0000
- Message:
"vlc_*_timedwait() expect a time in microseconds". Patch by funman.
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r642f48d |
r91d170a |
|
| 268 | 268 | vlc_object_lock( p_intf ); |
|---|
| 269 | 269 | if( time( NULL ) < p_sys->next_exchange ) |
|---|
| 270 | | b_die = vlc_object_timedwait( p_intf, p_sys->next_exchange ); |
|---|
| | 270 | { |
|---|
| | 271 | mtime_t deadline = (mtime_t)p_sys->next_exchange * (mtime_t)1000000; |
|---|
| | 272 | b_die = ( vlc_object_timedwait( p_intf, deadline) < 0 ); |
|---|
| | 273 | } |
|---|
| 271 | 274 | else |
|---|
| 272 | 275 | b_die = vlc_object_wait( p_intf ); |
|---|
| … | … | |
| 278 | 281 | return; |
|---|
| 279 | 282 | } |
|---|
| | 283 | /* we are signaled each time there is a song to submit */ |
|---|
| | 284 | else if( time( NULL ) < p_sys->next_exchange ) |
|---|
| | 285 | continue; |
|---|
| 280 | 286 | |
|---|
| 281 | 287 | /* handshake if needed */ |
|---|
