Changeset 45cd6d75350e2f9f3d1e7c30a7f34c119acb5ec8

Timestamp:

26/04/05 09:17:42 (4 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1114499862 +0000

git-parent:

[973ad2a430f2edde6be39aca1bc5abfa6fe78201]

git-author:

Laurent Aimar <fenrir@videolan.org> 1114499862 +0000

Message:

• control: added INPUT_DEL_INFO.
  
• input: allow chaining of access_filter (like filter1:filter2 ...)
  
• es_out: support VLC_META_NOW_PLAYING for multi-program stream.
  

Files:

• src/input/control.c (modified) (2 diffs)
• src/input/es_out.c (modified) (6 diffs)
• src/input/input.c (modified) (5 diffs)

src/input/control.c

@@ -197 +197 @@
-        }
-        return VLC_SUCCESS;
+        case INPUT_DEL_INFO:
+        {
+            char *psz_cat = (char *)va_arg( args, char * );
+            char *psz_name = (char *)va_arg( args, char * );
+
+            info_category_t *p_cat = NULL;
+            int i;
+
+            vlc_mutex_lock( &p_input->input.p_item->lock );
+            for( i = 0; i < p_input->input.p_item->i_categories; i++ )
+            {
+                if( !strcmp( p_input->input.p_item->pp_categories[i]->psz_name,
+                             psz_cat ) )
+                {
+                    p_cat = p_input->input.p_item->pp_categories[i];
+                    break;
+                }
+            }
+            if( p_cat == NULL )
+            {
+                vlc_mutex_unlock( &p_input->input.p_item->lock );
+                return VLC_EGENERIC;
+            }
+
+            for( i = 0; i < p_cat->i_infos; i++ )
+            {
+                if( !strcmp( p_cat->pp_infos[i]->psz_name, psz_name ) )
+                {
+                    REMOVE_ELEM( p_cat->pp_infos, p_cat->i_infos, i );
+                    break;
+                }
+            }
+            vlc_mutex_unlock( &p_input->input.p_item->lock );
+
+            if( i >= p_cat->i_infos )
+                return VLC_EGENERIC;
+
+            NotifyPlaylist( p_input );
+        }
+        return VLC_SUCCESS;
+
-
-        case INPUT_GET_INFO:
@@ -204 +245 @@
-            char **ppsz_value = (char **)va_arg( args, char ** );
-            int i_ret = VLC_EGENERIC;
-            int i;
-            *ppsz_value = NULL;
-

src/input/es_out.c

@@ -54 +54 @@
-    input_clock_t clock;
-
+    char    *psz_now_playing;
+
-} es_out_pgrm_t;
-
@@ -239 +241 @@
-    for( i = 0; i < p_sys->i_pgrm; i++ )
-    {
+        if( p_sys->pgrm[i]->psz_now_playing )
+            free( p_sys->pgrm[i]->psz_now_playing );
-        free( p_sys->pgrm[i] );
-    }
@@ -442 +446 @@
-    }
-
+    /* Update now playing if defined per program */
+    if( p_pgrm->psz_now_playing )
+    {
+        char *psz_cat = malloc( strlen(_("Program")) + 10 );
+
+        sprintf( psz_cat, "%s %d", _("Program"), p_pgrm->i_id );
+        input_Control( p_input, INPUT_ADD_INFO, _("Meta-information"),
+                       VLC_META_NOW_PLAYING, "%s", p_pgrm->psz_now_playing );
+        free( psz_cat );
+    }
+
+
-    var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
-}
@@ -460 +476 @@
-    p_pgrm->i_es = 0;
-    p_pgrm->b_selected = VLC_FALSE;
+    p_pgrm->psz_now_playing = NULL;
-    input_ClockInit( &p_pgrm->clock, VLC_FALSE, p_input->input.i_cr_average );
-
@@ -485 +502 @@
-{
-    es_out_sys_t      *p_sys = out->p_sys;
+    es_out_pgrm_t     *p_pgrm = NULL;
-    input_thread_t    *p_input = p_sys->p_input;
-    char              *psz_cat = malloc( strlen(_("Program")) + 10 );
+    char              *psz_name = NULL;
+    char              *psz_now_playing = NULL;
+    char              *psz_provider = NULL;
-    int i;
-
@@ -498 +519 @@
-        input_Control( p_input, INPUT_ADD_INFO, psz_cat,
-                      _(p_meta->name[i]), "%s", p_meta->value[i] );
+        if( !strcasecmp( p_meta->name[i], "Name" ) )
+            psz_name = p_meta->value[i];
+        else if( !strcasecmp( p_meta->name[i], "Provider" ) )
+            psz_provider = p_meta->value[i];
+        else if( !strcasecmp( p_meta->name[i], VLC_META_NOW_PLAYING ) )
+            psz_now_playing = p_meta->value[i];
+    }
+
+    if( !psz_name && !psz_now_playing )
+    {
+        free( psz_cat );
+        return;
+    }
+
+    for( i = 0; i < p_sys->i_pgrm; i++ )
+    {
+        if( p_sys->pgrm[i]->i_id == i_group )
+        {
+            p_pgrm = p_sys->pgrm[i];
+            break;
+        }
+    }
+
+    if( p_pgrm == NULL )
+        p_pgrm = EsOutProgramAdd( out, i_group );
+
+    /* Update the description text of the program */
+    if( psz_name && *psz_name )
+    {
+        vlc_value_t val;
+        vlc_value_t text;
+
+        /* ugly but it works */
+        val.i_int = i_group;
+        var_Change( p_input, "program", VLC_VAR_DELCHOICE, &val, NULL );
+
+        if( psz_provider && *psz_provider )
+        {
+            asprintf( &text.psz_string, "%s [%s]", psz_name, psz_provider );
+            var_Change( p_input, "program", VLC_VAR_ADDCHOICE, &val, &text );
+            free( text.psz_string );
+        }
+        else
+        {
+            text.psz_string = psz_name;
+            var_Change( p_input, "program", VLC_VAR_ADDCHOICE, &val, &text );
+        }
+    }
+    if( psz_now_playing )
+    {
+        p_pgrm->psz_now_playing = strdup(psz_now_playing);
+
+        if( p_sys->p_pgrm == p_pgrm )
+        {
+            input_Control( p_input, INPUT_ADD_INFO, _("Meta-information"),
+                           VLC_META_NOW_PLAYING, "%s", psz_now_playing );
+        }
-    }
-    free( psz_cat );

src/input/input.c

@@ -218 +218 @@
-        free( val.psz_string );
-    }
+
+    /* Remove 'Now playing' info as it is probably outdated */
+    input_Control( p_input, INPUT_DEL_INFO, _("Meta-information"),
+                   VLC_META_NOW_PLAYING );
-
-    /* Now we can attach our new input */
@@ -1912 +1916 @@
-    char *psz_demux;
-    char *psz_path;
+    char *psz_tmp;
-    char *psz;
-    vlc_value_t val;
@@ -1918 +1923 @@
-    if( !b_quick )
-    {
-
+
+
-
-        msg_Dbg( p_input, "`%s' gives access `%s' demux `%s' path `%s'",
@@ -2023 +2029 @@
-
-        /* */
-
-if(
+_tmp = psz
+while( psz &&
-        {
-            access_t *p_access = in->p_access;
-
-
+
+
+
+
+
-            in->p_access = access2_FilterNew( in->p_access, psz );
-            if( in->p_access == NULL )
@@ -2036 +2045 @@
-                          psz );
-            }
-
-
+
+
+
+
-
-        /* Get infos from access */