* src/playlist/playlist.c : Added playlist_AddItem (enqueues

playlist_item_t instead of psz_target ). Now playlist_Add uses
playlist_AddItem to enqueue.
* include/vlc_playlist.h : Added a psz_uri field in the playlist_item_t
structure.
* src/input/input.c : takes item->psz_uri  argument to start playing an
item.

diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h
index 6597b1122267d2a321d714af8faf19a059748143..8ca7ebb65d1abd45069d8dd1d848e9a74ba344c3 100644 (file)
--- a/include/vlc_playlist.h
+++ b/include/vlc_playlist.h
@@ -2,7 +2,7 @@
  * vlc_playlist.h : Playlist functions
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
- * $Id: vlc_playlist.h,v 1.5 2002/11/12 21:20:36 gbazin Exp $
+ * $Id: vlc_playlist.h,v 1.6 2002/12/03 23:36:41 gitan Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -27,6 +27,7 @@
 struct playlist_item_t
 {
     char *     psz_name;
+    char *     psz_uri; 
     int        i_type;   /* unused yet */
     int        i_status; /* unused yet */
     vlc_bool_t b_autodeletion;
@@ -69,5 +70,6 @@ void           playlist_Destroy  ( playlist_t * );
 VLC_EXPORT( void, playlist_Command, ( playlist_t *, int, int ) );
 
 VLC_EXPORT( int,  playlist_Add,    ( playlist_t *, const char *, int, int ) );
+VLC_EXPORT( int,  playlist_AddItem, ( playlist_t *, playlist_item_t *, int, int ) );
 VLC_EXPORT( int,  playlist_Delete, ( playlist_t *, int ) );
 

diff --git a/modules/misc/sap.c b/modules/misc/sap.c
index e4cd566eab39bdcb51afc460b213f2992f5c001e..70edbfe481114257467e4dc9f8f390c2e9fbff98 100644 (file)
--- a/modules/misc/sap.c
+++ b/modules/misc/sap.c
@@ -2,7 +2,7 @@
  * sap.c :  SAP interface module
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: sap.c,v 1.1 2002/12/03 16:29:04 gitan Exp $
+ * $Id: sap.c,v 1.2 2002/12/03 23:36:41 gitan Exp $
  *
  * Authors: Arnaud Schauly <gitan@via.ecp.fr>
  *
@@ -62,8 +62,8 @@
 
 #define MAX_LINE_LENGTH 256
 
-#define HELLO_PORT 9875  // SAP is aloways on that port
-#define HELLO_GROUP "239.255.255.255"   // FIX ME !!!!!!!!!!!!!!!
+#define HELLO_PORT 9875  /* SAP is always on that port */
+#define HELLO_GROUP "239.255.255.255"   
 #define ADD_SESSION 1;
 
 /*****************************************************************************
@@ -79,7 +79,6 @@ static int Kill          ( intf_thread_t * );
 static ssize_t NetRead    ( intf_thread_t*, int , byte_t *, size_t );
 
 typedef struct  sess_descr_s {
-/*    char *psz_version; // v field (protocol version) */
     char *psz_origin; /* o field (username sess-id sess-version 
                          nettype addrtype addr*/
     char *psz_sessionname; 
@@ -97,9 +96,8 @@ typedef struct  sess_descr_s {
 static int parse_sap ( char ** );
 static int packet_handle ( char **, intf_thread_t * );
 
-static sess_descr_t *  parse_sdp(char *  psz_pct) ;
-
-
+static sess_descr_t *  parse_sdp( char *,intf_thread_t * ) ;
+static playlist_item_t * sess_toitem( sess_descr_t * );
 
 
 /*****************************************************************************
@@ -137,7 +135,6 @@ static void Run( intf_thread_t *p_intf )
     char *psz_addr;
     char *psz_network = NULL;
     struct sockaddr_in addr;
-    struct ip_mreq mreq;
     int fd,addrlen;
     char *psz_buf;
 
@@ -185,7 +182,7 @@ static void Run( intf_thread_t *p_intf )
         
         if( i_read < 0 )
         {
-            msg_Err( p_intf, "argggg" );
+            msg_Err( p_intf, "Cannot read in the socket" );
         }
         if( i_read == 0 )
         {
@@ -193,7 +190,6 @@ static void Run( intf_thread_t *p_intf )
         }
 
 
-        msg_Dbg( p_intf, "New packet arrived" );
         packet_handle( &psz_buf, p_intf  );
                                    
     }
@@ -214,7 +210,25 @@ static int Kill( intf_thread_t *p_intf )
     return VLC_SUCCESS;
 }
 
- 
+/*******************************************************************
+ * sess_toitem : changes a sess_descr_t into a playlist_item_t
+ *******************************************************************/
+
+static playlist_item_t *  sess_toitem( sess_descr_t * p_sd )
+{
+    playlist_item_t * p_item;
+    
+    p_item = malloc( sizeof( playlist_item_t ) );
+    p_item->psz_name = p_sd->psz_sessionname;
+    p_item->psz_uri = p_sd->psz_uri; 
+    p_item->i_type = 0;
+    p_item->i_status = 0;
+    p_item->b_autodeletion = VLC_FALSE; 
+
+    return p_item;
+
+}
+
 /********************************************************************
  * parse_sap : Takes care of the SAP headers
  ********************************************************************
@@ -238,32 +252,34 @@ static int parse_sap( char **  ppsz_sa_packet ) {  /* Dummy Parser : does nothin
 
 static int packet_handle( char **  ppsz_packet, intf_thread_t * p_intf )  {
     int j=0;
-    sess_descr_t * sd;
-    playlist_t *p_playlist; 
+    sess_descr_t * p_sd;
+    playlist_t *p_playlist;
+    playlist_item_t *p_item;
     char *  psz_enqueue;
-    char *  psz_udp = "udp://@\0";
     int i;
     
     j=parse_sap( ppsz_packet ); 
     
     if(j != 0) {
-        msg_Dbg( p_intf, "SAP packet parsed");
-        sd = parse_sdp( * ppsz_packet ); 
+        p_sd = parse_sdp( *ppsz_packet, p_intf ); 
         
-        i = strlen( psz_udp ) + strlen( sd->psz_uri )+1 ;
+        i = strlen( "udp://@\0" ) + strlen( p_sd->psz_uri )+1 ;
         psz_enqueue = malloc ( i * sizeof (char) );
         memset( psz_enqueue, '\0',i );
-        strcat ( psz_enqueue,psz_udp );
-        strcat ( psz_enqueue,sd->psz_uri );
+        strcat ( psz_enqueue,"udp://@\0" );
+        strcat ( psz_enqueue,p_sd->psz_uri );
+        free( p_sd->psz_uri );
+        p_sd->psz_uri = psz_enqueue;
         
+        p_item = sess_toitem ( p_sd );
         p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
-        playlist_Add ( p_playlist, psz_enqueue, PLAYLIST_CHECK_INSERT, PLAYLIST_END); 
-        msg_Dbg(p_intf,"SAP packet : End of treatment");
+
+        playlist_AddItem ( p_playlist, p_item, PLAYLIST_CHECK_INSERT, PLAYLIST_END);
         vlc_object_release( p_playlist );
         
+        free ( p_sd );
         return 1;
     }
-    free ( sd );
     return 0; // Invalid Packet 
 }
         
@@ -276,7 +292,7 @@ static int packet_handle( char **  ppsz_packet, intf_thread_t * p_intf )  {
  * Make a sess_descr_t with a psz
  ******************************************************/
 
-static sess_descr_t *  parse_sdp(char *  psz_pct) 
+static sess_descr_t *  parse_sdp( char *  psz_pct, intf_thread_t * p_intf ) 
 {
     int j,k;
     char **  ppsz_fill;
@@ -289,8 +305,8 @@ static sess_descr_t *  parse_sdp(char *  psz_pct)
        {           
            switch(psz_pct[(j-1)]) {
 /*               case ('v') : {
-//               ppsz_fill = & sd->psz_version;
-//               break;
+                 ppsz_fill = & sd->psz_version;
+                 break;
             } */
             case ('o') : {
                ppsz_fill = & sd->psz_origin;
@@ -334,7 +350,7 @@ static sess_descr_t *  parse_sdp(char *  psz_pct)
             }
 
             default : { 
-               fprintf( stderr,"Warning : Ignored field \"%c\" \n",psz_pct[j-1] );
+/*               msg_Dbg( p_intf, "Warning : Ignored field \"%c\" \n",psz_pct[j-1] ); */
                ppsz_fill = NULL;
             }
 

diff --git a/src/input/input.c b/src/input/input.c
index 25252d818583c538d3e8eec2c15b95eaade23c90..ed39114e7bed136997d3f128f18a61eab8223b2f 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -4,7 +4,7 @@
  * decoders.
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: input.c,v 1.215 2002/11/11 14:39:12 sam Exp $
+ * $Id: input.c,v 1.216 2002/12/03 23:36:41 gitan Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -82,7 +82,7 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent,
     p_input->b_eof      = 0;
 
     /* Set target */
-    p_input->psz_source = strdup( p_item->psz_name );
+    p_input->psz_source = strdup( p_item->psz_uri );
 
     /* Demux */
     p_input->p_demux = NULL;

diff --git a/src/playlist/playlist.c b/src/playlist/playlist.c
index 5345b93808ba149f7822275fbbb75ebcfca1e93e..655dc5de47247d45e0d9cba078f8404aeecdc7d4 100644 (file)
--- a/src/playlist/playlist.c
+++ b/src/playlist/playlist.c
@@ -2,7 +2,7 @@
  * playlist.c : Playlist management functions
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: playlist.c,v 1.24 2002/12/03 16:29:04 gitan Exp $
+ * $Id: playlist.c,v 1.25 2002/12/03 23:36:41 gitan Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -103,9 +103,28 @@ void playlist_Destroy( playlist_t * p_playlist )
 int playlist_Add( playlist_t *p_playlist, const char * psz_target,
                                           int i_mode, int i_pos )
 {
-    playlist_item_t *p_item;
+    playlist_item_t * p_item; 
+    
+    p_item = malloc( sizeof( playlist_item_t ) );
+    if( p_item == NULL )
+    {
+        msg_Err( p_playlist, "out of memory" );
+    }
+
+    p_item->psz_name = strdup( psz_target );
+    p_item->psz_uri  = strdup( psz_target );
+    p_item->i_type = 0;
+    p_item->i_status = 0;
+    p_item->b_autodeletion = VLC_FALSE;
+
+    return playlist_AddItem( p_playlist, p_item, i_mode, i_pos );
+}
 
 
+int playlist_AddItem( playlist_t *p_playlist, playlist_item_t * p_item,
+                int i_mode, int i_pos)
+{
+
     vlc_mutex_lock( &p_playlist->object_lock );
 
     /*
@@ -120,10 +139,17 @@ int playlist_Add( playlist_t *p_playlist, const char * psz_target,
          {
              for ( j = 0; j < p_playlist->i_size; j++ )
              {
-                 if ( !strcmp( p_playlist->pp_items[j]->psz_name, psz_target ) )
+                 if ( !strcmp( p_playlist->pp_items[j]->psz_uri, p_item->psz_uri ) )
                  {
-                      msg_Dbg( p_playlist, "item « %s » already enqued", 
-                                        psz_target );
+                      if( p_item->psz_name ) 
+                      {
+                          free( p_item->psz_name );
+                      }
+                      if( p_item->psz_uri )
+                      {
+                          free( p_item->psz_uri );
+                      }
+                      free( p_item );
                       vlc_mutex_unlock( &p_playlist->object_lock );
                       return 0;   
                  }
@@ -134,19 +160,9 @@ int playlist_Add( playlist_t *p_playlist, const char * psz_target,
     }
 
     
-    msg_Dbg( p_playlist, "adding playlist item « %s »", psz_target );
+    msg_Dbg( p_playlist, "adding playlist item « %s »", p_item->psz_name );
     
     /* Create the new playlist item */
-    p_item = malloc( sizeof( playlist_item_t ) );
-    if( p_item == NULL )
-    {
-        msg_Err( p_playlist, "out of memory" );
-    }
-
-    p_item->psz_name = strdup( psz_target );
-    p_item->i_type = 0;
-    p_item->i_status = 0;
-    p_item->b_autodeletion = VLC_FALSE;
 
 
     /* Do a few boundary checks and allocate space for the item */