src/control/core.c: fix start-time handling in start + coding style fixes

diff --git a/src/control/core.c b/src/control/core.c
index 3fabdd9fa70a48eceffc01fa32b0ff19ca5e8819..3e31fc2ebd5c1018382bf3bd22fc42a94de85990 100644 (file)
--- a/src/control/core.c
+++ b/src/control/core.c
@@ -195,16 +195,23 @@ mediacontrol_start( mediacontrol_Instance *self,
     vlc_mutex_lock( &p_playlist->object_lock );
     if( p_playlist->i_size )
     {
-        int i_from; 
-       char * psz_from = (char *) malloc (20 * sizeof(char));
-       playlist_item_t * p_item = *(p_playlist->pp_items);
+        int i_index;
+        int i_from;
+       char * psz_from = ( char * )malloc( 20 * sizeof( char ) );
 
         i_from = mediacontrol_position2microsecond( p_playlist->p_input, a_position ) / 1000000;
        
+        i_index = p_playlist->i_index;
+        if( i_index < 0 )
+        { 
+            /* We know that there is at least 1 element, since i_size != 0 */
+            i_index = 0;
+        }
+
         /* Set start time */
-       snprintf( psz_from, 20, "start-time=%i", i_from);
-       playlist_ItemAddOption( p_item, psz_from);
-       free(psz_from);
+       snprintf( psz_from, 20, "start-time=%i", i_from );
+       playlist_ItemAddOption( p_playlist->pp_items[i_index], psz_from );
+       free( psz_from );
 
         vlc_mutex_unlock( &p_playlist->object_lock );