Changeset 1e0b16b3bc024adedbabcdef036e6aee0cf040b0
- Timestamp:
- 05/15/06 14:28:44
(2 years ago)
- Author:
- Clément Stenac <zorglub@videolan.org>
- git-committer:
- Clément Stenac <zorglub@videolan.org> 1147696124 +0000
- git-parent:
[dea44d9658b8b052594133f1abf53eb80903e595]
- git-author:
- Clément Stenac <zorglub@videolan.org> 1147696124 +0000
- Message:
Should fix Xosd compilation
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| red0b72e |
r1e0b16b |
|
| 207 | 207 | playlist_t *p_playlist; |
|---|
| 208 | 208 | playlist_item_t *p_item = NULL; |
|---|
| 209 | | input_item_t item; |
|---|
| | 209 | input_item_t *p_input; |
|---|
| 210 | 210 | char psz_duration[MSTRTIME_MAX_SIZE+2]; |
|---|
| 211 | 211 | char *psz_display = NULL; |
|---|
| … | … | |
| 245 | 245 | else |
|---|
| 246 | 246 | { |
|---|
| 247 | | p_item = p_playlist->status.p_item; |
|---|
| 248 | | item = p_item->input; |
|---|
| | 247 | p_item = p_playlist->status.p_item; |
|---|
| | 248 | p_input = p_item->p_input; |
|---|
| 249 | 249 | if( !p_item ) |
|---|
| 250 | 250 | { |
|---|
| … | … | |
| 255 | 255 | vlc_object_release( p_playlist ); |
|---|
| 256 | 256 | |
|---|
| 257 | | if( item.i_duration != -1 ) |
|---|
| | 257 | if( p_input->i_duration != -1 ) |
|---|
| 258 | 258 | { |
|---|
| 259 | 259 | char psz_durationstr[MSTRTIME_MAX_SIZE]; |
|---|
| 260 | | secstotimestr( psz_durationstr, item.i_duration/1000000 ); |
|---|
| | 260 | secstotimestr( psz_durationstr, p_input->i_duration/1000000 ); |
|---|
| 261 | 261 | sprintf( psz_duration, "(%s)", psz_durationstr ); |
|---|
| 262 | 262 | } |
|---|
| … | … | |
| 267 | 267 | |
|---|
| 268 | 268 | psz_display = (char *)malloc( sizeof(char )* |
|---|
| 269 | | (strlen( item.psz_name ) + |
|---|
| | 269 | (strlen( p_input->psz_name ) + |
|---|
| 270 | 270 | MSTRTIME_MAX_SIZE + 2+6 + 10 +10 )); |
|---|
| 271 | 271 | sprintf( psz_display,"%s %s", |
|---|
| 272 | | item.psz_name, psz_duration); |
|---|
| | 272 | p_input->psz_name, psz_duration); |
|---|
| 273 | 273 | } |
|---|
| 274 | 274 | |
|---|