Changeset 12087b5571643095d90eb5ecc1825594d93e31da

Timestamp:

01/19/08 21:56:18 (8 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1200776178 +0000

git-parent:

[3613b8a933d9e4785f6d3541cf5f2aaca25b3402]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1200776178 +0000

Message:

services/discovery/shout.c: Add a French TV service discovery. For now it only has C+ and les guignols.

Files:

• modules/services_discovery/shout.c (modified) (5 diffs)

modules/services_discovery/shout.c

@@ -35 +35 @@
- *****************************************************************************/
-
-
+, FrenchTV = 3
-
-static int  Open( vlc_object_t *, enum type_e );
-static void Close( vlc_object_t * );
-
-atic const struc
+ruct shout_item_
-{
-    const char *psz_url;
-    const char *psz_name;
-    const char *ppsz_options[2];
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-};
-
@@ -58 +87 @@
-static int Open ## type ( vlc_object_t *p_this )    \
-{                                                   \
+    msg_Dbg( p_this, "Starting " #type );           \
-    return Open( p_this, type );                    \
-}
@@ -64 +94 @@
-OPEN( ShoutTV )
-OPEN( Freebox )
+OPEN( FrenchTV )
-
-vlc_module_begin();
@@ -83 +114 @@
-        set_callbacks( OpenShoutTV, Close );
-        add_shortcut( "shoutcasttv" );
+
+    add_submodule();
+        set_shortname( "frenchtv");
+        set_description( _("French TV") );
+        set_capability( "services_discovery", 0 );
+        set_callbacks( OpenFrenchTV, Close );
+        add_shortcut( "frenchtv" );
-
-    add_submodule();
@@ -118 +156 @@
-static void ItemAdded( const vlc_event_t * p_event, void * user_data )
-{
-ervices_discovery_t *p_sd
-
+truct shout_category_t * params
+arams->p
-            p_event->u.input_item_subitem_added.p_new_child,
-NULL /* no category */
-
-
-
-Run
-
-void Run( services_discovery_t *p_sd )
-
-
+params->psz_category
+
+
+
+CreateInputItemFromShoutItem
+
+input_item_t * CreateInputItemFromShoutItem( services_discovery_t *p_sd,
+
+
-    int i;
+    /* Create the item */
-    input_item_t *p_input = input_ItemNewExt( p_sd,
-
-
-
-
+
+
+
+
+
+
-    input_ItemAddOption( p_input, "no-playlist-autostart" );
-
+    return p_input;
+}
+
+/*****************************************************************************
+ * AddSubitemsOfShoutItemURL:
+ *****************************************************************************/
+static void AddSubitemsOfShoutItemURL( services_discovery_t *p_sd,
+                                       const struct shout_item_t * p_item,
+                                       const char * psz_category )
+{
+    struct shout_category_t category = { p_sd, psz_category };
+
+    /* Create the item */
+    input_item_t *p_input = CreateInputItemFromShoutItem( p_sd, p_item );
+
+    /* Read every subitems, and add them in ItemAdded */
-    vlc_event_attach( &p_input->event_manager, vlc_InputItemSubItemAdded,
-p_sd
+&category
-    input_Read( p_sd, p_input, VLC_TRUE );
-    vlc_event_detach( &p_input->event_manager, vlc_InputItemSubItemAdded,
-
+
+
-    vlc_gc_decref( p_input );
-}
-
-/*****************************************************************************
+ * Run:
+ *****************************************************************************/
+static void Run( services_discovery_t *p_sd )
+{
+    enum type_e i_type = (enum type_e)p_sd->p_sys;
+    int i, j;
+    
+    if( !p_items[i_type].p_children )
+    {
+        AddSubitemsOfShoutItemURL( p_sd, &p_items[i_type], NULL );
+        return;
+    }
+    for( i = 0; p_items[i_type].p_children[i].psz_name; i++ )
+    {
+        const struct shout_item_t * p_subitem = &p_items[i_type].p_children[i];
+        if( !p_subitem->p_children )
+        {
+            AddSubitemsOfShoutItemURL( p_sd, p_subitem, p_subitem->psz_name );
+            continue;
+        }
+        for( j = 0; p_subitem->p_children[j].psz_name; j++ )
+        {
+            input_item_t *p_input = CreateInputItemFromShoutItem( p_sd, &p_subitem->p_children[j] );
+            services_discovery_AddItem( p_sd,
+                p_input,
+                p_subitem->psz_name );
+            vlc_gc_decref( p_input );
+        }
+    }
+}
+
+/*****************************************************************************
- * Close:
- *****************************************************************************/