Changeset 0697a96a2cc92d600a66b34f5e1c28e0dbe80c36

Timestamp:

05/01/04 13:59:54 (5 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1073307594 +0000

git-parent:

[17557ea64382428560a75ecef753e88f39158834]

git-author:

Clément Stenac <zorglub@videolan.org> 1073307594 +0000

Message:

* modules/misc/sap.c :

• Use the new playlist API
  
• Track title changes
  
• Timeout. Delete an item if we haven't heard about it for too long.
  

Files:

• modules/misc/sap.c (modified) (21 diffs)

modules/misc/sap.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-3 2003/12/12 15:37:23
+4 2004/01/05 12:59:54
- *
- * Authors: Arnaud Schauly <gitan@via.ecp.fr>
@@ -167 +167 @@
-struct sap_announce_t
-{
+    mtime_t i_last;
+    int i_id;
-    char *psz_name;
-    char *psz_uri;
@@ -280 +282 @@
-            psz_scope = strdup( "8" );
-        }
-
+
+
-        free( psz_scope );
-
@@ -374 +377 @@
-    while( !p_intf->b_die )
-    {
+        playlist_t *p_playlist= NULL;
+        int i;
-        int i_read = NetRead( p_intf, p_sys->fd, buffer, MAX_SAP_BUFFER );
-        uint8_t *p_sdp;
@@ -384 +389 @@
-        unsigned char *p_decompressed_buffer;
-        int i_decompressed_size;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        /* Minimum length is > 6 */
-        if( i_read <= 6 )
@@ -468 +512 @@
-            msg_Warn( p_intf, "ditching sap packet" );
-        }
+
-    }
-}
@@ -588 +633 @@
-static void sess_toitem( intf_thread_t * p_intf, sess_descr_t * p_sd )
-{
-    playlist_item_t * p_item;
-    struct sap_announce_t *p_announce;
-
+, *psz_item_uri
-    char *psz_port;
-    char *psz_uri_default;
-
+ , i_pos , i_id = 0
-    vlc_bool_t b_http = VLC_FALSE;
-    char *psz_http_path = NULL;
@@ -601 +645 @@
-    if( p_sd->i_media > 1 )
-    {
-_item = malloc( sizeof( playlist_item_t )
-_item
+sz_uri = malloc( strlen( p_sd->psz_sdp ) + 7
+sz_uri
-        {
-            msg_Warn( p_intf, "out of memory" );
-            return;
-        }
-        p_item->psz_name    = strdup( p_sd->psz_sessionname );
-        p_item->psz_uri     = NULL;
-        p_item->i_duration  = -1;
-        p_item->ppsz_options= NULL;
-        p_item->i_options   = 0;
-
-        p_item->i_type      = 0;
-        p_item->i_status    = 0;
-        p_item->b_autodeletion = VLC_FALSE;
-        p_item->b_enabled   = VLC_TRUE;
-        p_item->i_group     = p_intf->p_sys->i_group;
-        p_item->psz_author  = strdup( "" );
-        psz_uri = malloc( strlen( p_sd->psz_sdp ) + 7 );
-        if( psz_uri == NULL )
-        {
-            msg_Warn( p_intf, "out of memory" );
-            free( p_item->psz_name );
-            free( p_item->psz_author );
-            free( p_item );
-            return;
-        }
-        p_item->psz_uri = psz_uri;
-        memcpy( psz_uri, "sdp://", 6 );
-        psz_uri += 6;
-        memcpy( psz_uri, p_sd->psz_sdp, strlen( p_sd->psz_sdp ) + 1 );
-
-
+
+
-        for( i = 0 ; i< p_intf->p_sys->i_announces ; i++ )
-        {
-            if( !strcmp(p_intf->p_sys->pp_announces[i]->psz_uri,
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        p_announce = (struct sap_announce_t *)malloc(
-                      sizeof(struct sap_announce_t) );
-item->psz_
-
-p_item->psz_
+sd->psz_session
+
+ p_sd->psz_session
-        }
-        else
@@ -655 +684 @@
-            p_announce->psz_name = strdup( "" );
-        }
-_item->p
-
-_item->p
+
+
+
-        }
-        else
@@ -663 +692 @@
-            p_announce->psz_uri = strdup( "" );
-        }
+        p_announce->i_id = i_id;
-
-        INSERT_ELEM( p_intf->p_sys->pp_announces,
@@ -668 +698 @@
-                     p_intf->p_sys->i_announces,
-                     p_announce );
+
+        vlc_object_release( p_playlist );
-        return;
-    }
@@ -675 +707 @@
-    for( i_count = 0 ; i_count < p_sd->i_media ; i_count++ )
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-        if( !p_sd->pp_media[i_count] )
@@ -735 +753 @@
-            if(!strcasecmp( p_sd->pp_attributes[i]->psz_field , "plgroup"))
-            {
-
+group_
-                p_playlist =
-                (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
@@ -744 +762 @@
-                }
-
-
-          
-
+group_
+
+group_
-                {
-p_item->i_group = i
+i_group = i_group
-                }
-                else
@@ -755 +773 @@
-                            playlist_CreateGroup( p_playlist,
-                                       p_sd->pp_attributes[i]->psz_value);
-p_item->
+
-                }
-                vlc_object_release( p_playlist );
@@ -761 +779 @@
-        }
-
-_item->p
+
-        if( b_http == VLC_FALSE )
-        {
-_item->psz
-     
+sz_item
+
-            if( ismult( psz_uri ) )
-            {
-_item->psz
+sz_item
-                         psz_proto, psz_uri, psz_port );
-            }
-            else
-            {
-_item->psz
+sz_item
-                         psz_proto, psz_uri, psz_port );
-            }
@@ -784 +802 @@
-            }
-
-
-
-
+
+
+
+
-                            psz_uri, psz_port,psz_http_path );
-
@@ -795 +814 @@
-        }
-
+        /* Check if we already know this item */
-         for( i = 0 ; i< p_intf->p_sys->i_announces ; i++ )
-         {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                return;
-            }
-        }
-
-Enqueueing p_
+Add the 
-        p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
-                                      FIND_ANYWHERE );
-
-
-
-
+
+
+
+
+
+
+
-        p_announce = (struct sap_announce_t *)malloc(
-                      sizeof(struct sap_announce_t) );
-p_item->psz_
-
-p_item->psz_
+ p_sd->psz_session
+
+ p_sd->psz_session
-        }
-        else
@@ -821 +875 @@
-            p_announce->psz_name = strdup( "" );
-        }
-_item->psz
-
-_item->psz
+sz_item
+
+sz_item
-        }
-        else
@@ -829 +883 @@
-            p_announce->psz_uri = strdup( "" );
-        }
+        p_announce->i_id = i_id;
+
+        p_announce->i_last = mdate();
+
+        vlc_object_release( p_playlist );
-
-        INSERT_ELEM( p_intf->p_sys->pp_announces,
@@ -834 +893 @@
-                     p_intf->p_sys->i_announces,
-                     p_announce );
-        vlc_object_release( p_playlist );
-    }
-}