Changeset 6d6185f24f8c3ebade4e22babcd027606a6d3b69
- Timestamp:
- 11/04/08 19:11:52
(8 months ago)
- Author:
- Pierre d'Herbemont <pdherbemont@videolan.org>
- git-committer:
- Pierre d'Herbemont <pdherbemont@videolan.org> 1207933912 +0200
- git-parent:
[35dc9b31f0bbf161974366ae1c8a41c4705faaec]
- git-author:
- Pierre d'Herbemont <pdherbemont@videolan.org> 1207933912 +0200
- Message:
test: Get rid of the sleep() that crept in our test code.
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r01a95e7 |
r6d6185f |
|
| 53 | 53 | |
|---|
| 54 | 54 | libvlc_media_list_player_play_item( mlp, md, &ex ); |
|---|
| 55 | | sleep(1); // play is asynchronous |
|---|
| 56 | 55 | catch (); |
|---|
| 57 | 56 | |
|---|
| r01a95e7 |
r6d6185f |
|
| 48 | 48 | catch (); |
|---|
| 49 | 49 | |
|---|
| 50 | | /* FIXME: Do something clever */ |
|---|
| 51 | | sleep(1); |
|---|
| | 50 | /* Wait a correct state */ |
|---|
| | 51 | libvlc_state_t state; |
|---|
| | 52 | do { |
|---|
| | 53 | state = libvlc_media_player_get_state (mi, &ex); |
|---|
| | 54 | catch (); |
|---|
| | 55 | } while( state != libvlc_Playing && |
|---|
| | 56 | state != libvlc_Error && |
|---|
| | 57 | state != libvlc_MediaPlayerEndReached ); |
|---|
| 52 | 58 | |
|---|
| 53 | | assert( libvlc_media_player_get_state (mi, &ex) != libvlc_Error ); |
|---|
| 54 | | catch (); |
|---|
| | 59 | assert( state == libvlc_Playing || state == libvlc_MediaPlayerEndReached ); |
|---|
| 55 | 60 | |
|---|
| 56 | 61 | libvlc_media_player_stop (mi, &ex); |
|---|
| … | … | |
| 88 | 93 | catch (); |
|---|
| 89 | 94 | |
|---|
| 90 | | /* FIXME: Do something clever */ |
|---|
| 91 | | sleep(1); |
|---|
| | 95 | /* Wait a correct state */ |
|---|
| | 96 | libvlc_state_t state; |
|---|
| | 97 | do { |
|---|
| | 98 | state = libvlc_media_player_get_state (mi, &ex); |
|---|
| | 99 | catch (); |
|---|
| | 100 | } while( state != libvlc_Playing && |
|---|
| | 101 | state != libvlc_Error && |
|---|
| | 102 | state != libvlc_MediaPlayerEndReached ); |
|---|
| 92 | 103 | |
|---|
| 93 | | assert( libvlc_media_player_get_state (mi, &ex) == libvlc_Playing ); |
|---|
| 94 | | catch (); |
|---|
| | 104 | assert( state == libvlc_Playing || state == libvlc_MediaPlayerEndReached ); |
|---|
| 95 | 105 | |
|---|
| 96 | 106 | libvlc_media_player_pause (mi, &ex); |
|---|