Commit 4842d4ca authored by Gildas Bazin's avatar Gildas Bazin

* src/playlist/*: a couple of compilation fixes.

parent a0ffcd86
...@@ -246,7 +246,7 @@ int playlist_ItemSetDuration( playlist_item_t *p_item, mtime_t i_duration ) ...@@ -246,7 +246,7 @@ int playlist_ItemSetDuration( playlist_item_t *p_item, mtime_t i_duration )
p_item->input.i_duration = i_duration; p_item->input.i_duration = i_duration;
if( i_duration != -1 ) if( i_duration != -1 )
{ {
secstotimestr( psz_buffer, i_duration/1000000 ); secstotimestr( psz_buffer, (int)(i_duration/1000000) );
} }
else else
{ {
...@@ -291,5 +291,5 @@ static void GuessType( input_item_t *p_item) ...@@ -291,5 +291,5 @@ static void GuessType( input_item_t *p_item)
return; return;
} }
} }
return ITEM_TYPE_UNKNOWN; p_item->i_type = ITEM_TYPE_UNKNOWN;
} }
...@@ -221,11 +221,11 @@ int playlist_Control( playlist_t * p_playlist, int i_query, ... ) ...@@ -221,11 +221,11 @@ int playlist_Control( playlist_t * p_playlist, int i_query, ... )
int playlist_vaControl( playlist_t * p_playlist, int i_query, va_list args ) int playlist_vaControl( playlist_t * p_playlist, int i_query, va_list args )
{ {
vlc_mutex_lock( &p_playlist->object_lock );
playlist_view_t *p_view; playlist_view_t *p_view;
vlc_value_t val; vlc_value_t val;
vlc_mutex_lock( &p_playlist->object_lock );
#ifdef PLAYLIST_PROFILE #ifdef PLAYLIST_PROFILE
p_playlist->request_date = mdate(); p_playlist->request_date = mdate();
#endif #endif
......
...@@ -90,7 +90,8 @@ playlist_view_t * playlist_ViewCreate( playlist_t *p_playlist, int i_id, ...@@ -90,7 +90,8 @@ playlist_view_t * playlist_ViewCreate( playlist_t *p_playlist, int i_id,
*/ */
int playlist_ViewInsert( playlist_t *p_playlist, int i_id, char *psz_name ) int playlist_ViewInsert( playlist_t *p_playlist, int i_id, char *psz_name )
{ {
playlist_view_t *p_view = playlist_ViewCreate( p_playlist, i_id , psz_name); playlist_view_t *p_view =
playlist_ViewCreate( p_playlist, i_id , psz_name );
if( !p_view ) if( !p_view )
{ {
msg_Err( p_playlist, "Creation failed" ); msg_Err( p_playlist, "Creation failed" );
...@@ -99,12 +100,11 @@ int playlist_ViewInsert( playlist_t *p_playlist, int i_id, char *psz_name ) ...@@ -99,12 +100,11 @@ int playlist_ViewInsert( playlist_t *p_playlist, int i_id, char *psz_name )
vlc_mutex_lock( &p_playlist->object_lock ); vlc_mutex_lock( &p_playlist->object_lock );
INSERT_ELEM( p_playlist->pp_views, INSERT_ELEM( p_playlist->pp_views, p_playlist->i_views,
p_playlist->i_views, p_playlist->i_views, p_view );
p_playlist->i_views,
p_view );
vlc_mutex_unlock( &p_playlist->object_lock ); vlc_mutex_unlock( &p_playlist->object_lock );
return VLC_SUCCESS;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment