Changeset 662ed774b9740eabf8b0203e53f51e6c35657e0d

Timestamp:

18/08/07 16:59:31 (1 year ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1187449171 +0000

git-parent:

[a387a1ff337681b34c749ac762338ac673254574]

git-author:

Rafaël Carré <funman@videolan.org> 1187449171 +0000

Message:

Input access locking, part 2.
Fix [21193]

Files:

• include/vlc_input.h (modified) (6 diffs)
• modules/misc/notify/growl.c (modified) (1 diff)
• modules/misc/notify/notify.c (modified) (1 diff)
• modules/misc/playlist/m3u.c (modified) (2 diffs)
• modules/misc/playlist/xspf.c (modified) (4 diffs)
• modules/visualization/goom.c (modified) (1 diff)
• src/input/control.c (modified) (2 diffs)
• src/input/es_out.c (modified) (3 diffs)
• src/input/input.c (modified) (5 diffs)
• src/input/meta.c (modified) (13 diffs)
• src/playlist/control.c (modified) (1 diff)
• src/playlist/engine.c (modified) (3 diffs)
• src/playlist/item.c (modified) (1 diff)
• src/text/strings.c (modified) (2 diffs)
• src/video_output/video_output.c (modified) (4 diffs)

include/vlc_input.h

@@ -27 +27 @@
-#endif
-
+#ifndef __USE_GNU
+#define __USE_GNU
+#endif
+#include <string.h>                                     /* strcasestr() */
+
-/* __ is need because conflict with <vlc/input.h> */
-#ifndef _VLC__INPUT_H
@@ -223 +228 @@
-    vlc_event_t event;
-
-//
+
-    if( !p_i->p_meta )
-        p_i->p_meta = vlc_meta_New();
-    vlc_meta_Set( p_i->p_meta, meta_type, psz_val );
-//
+
-
-    /* Notify interested third parties */
@@ -237 +242 @@
-static inline vlc_bool_t input_item_MetaMatch( input_item_t *p_i, vlc_meta_type_t meta_type, const char *psz )
-{
-//
+
-    const char * meta = vlc_meta_Get( p_i->p_meta, meta_type );
-    vlc_bool_t ret = meta && strcasestr( meta, psz );
-//
+
-
-    return ret;
@@ -248 +253 @@
-{
-    char * psz = NULL;
-//
+
-
-    if( !p_i->p_meta )
-    {
-//
+
-        return NULL;
-    }
@@ -259 +264 @@
-        psz = strdup( vlc_meta_Get( p_i->p_meta, meta_type ) );
-
-//
+
-    return psz;
-}
@@ -265 +270 @@
-static inline char * input_item_GetName( input_item_t * p_i )
-{
-//
+
-    char *psz_s = p_i->psz_name ? strdup( p_i->psz_name ) : NULL;
-//
+
-    return psz_s;
-}

modules/misc/notify/growl.c

@@ -125 +125 @@
-    vlc_object_yield( p_input );
-
-
+
+
-    {
-        /* Not playing anything ... */
+        free( psz_name );
-        vlc_object_release( p_input );
-        return VLC_SUCCESS;
-    }
+    free( psz_name );
-
-    /* Playing something ... */
-
-
-
-
-
-
-
+
+
+
+
+
-    if( psz_title == NULL ) psz_title = strdup( N_("(no title)") );
-    snprintf( psz_tmp, GROWL_MAX_LENGTH, "%s %s %s",

modules/misc/notify/notify.c

@@ -151 +151 @@
-
-    /* Playing something ... */
-
-
-
-
-
-
-
+
+
+
+
+
-
-    vlc_object_release( p_input );

modules/misc/playlist/m3u.c

@@ -66 +66 @@
-
-        /* General info */
-
-
-
+
+
-        {
-
-
-
+
+
-            if( psz_artist && *psz_artist )
-            {
@@ -88 +86 @@
-                          p_current->p_input->psz_name);
-            }
-
-
+
-        }
+        free( psz_name );
-
-        /* VLC specific options */

modules/misc/playlist/xspf.c

@@ -164 +164 @@
-
-    /* -> the artist/creator */
-
-
-
+
+
-    psz_temp = convert_xml_special_chars( psz );
-if( psz ) 
+
-    if( *psz_temp )
-    {
@@ -176 +175 @@
-
-    /* -> the album */
-
-
-
+
+
-    psz_temp = convert_xml_special_chars( psz );
-if( psz ) 
+
-    if( *psz_temp )
-    {
@@ -188 +186 @@
-
-    /* -> the track number */
-
-
-
+
+
-    if( psz )
-    {
@@ -197 +194 @@
-            fprintf( p_file, "\t\t\t<trackNum>%i</trackNum>\n", atoi( psz ) );
-        }
-    free( psz );
-}
+}
+free( psz );
-
-    /* -> the description */
-
-
-
+
+
-    psz_temp = convert_xml_special_chars( psz );
-if( psz ) 
+
-    if( *psz_temp )
-    {

modules/visualization/goom.c

@@ -417 +417 @@
-    if( p_input )
-    {
-
-
-
-
-
-
+
+
+
+
-            char *psz = strrchr( input_GetItem(p_input)->psz_uri, '/' );
-

src/input/control.c

@@ -153 +153 @@
-                if( !p_cat )
-                {
-
+un
-                    return VLC_EGENERIC;
-                }
@@ -181 +181 @@
-                if( !p_info )
-                {
-
+un
-                    return VLC_EGENERIC;
-                }

src/input/es_out.c

@@ -488 +488 @@
-
-    /* Update now playing */
-    vlc_mutex_lock( &p_input->p->input.p_item->lock );
-    input_item_SetNowPlaying( p_input->p->input.p_item,
-                              p_pgrm->psz_now_playing );
-    input_item_SetPublisher( p_input->p->input.p_item,
-                             p_pgrm->psz_publisher );
-    vlc_mutex_unlock( &p_input->p->input.p_item->lock );
-
-    var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
@@ -673 +671 @@
-    {
-        if( p_sys->p_pgrm == p_pgrm )
-        {
-            vlc_mutex_lock( &p_input->p->input.p_item->lock );
-            input_item_SetPublisher( p_input->p->input.p_item, psz_provider );
-            vlc_mutex_unlock( &p_input->p->input.p_item->lock );
-        }
-        input_Control( p_input, INPUT_ADD_INFO, psz_cat, input_MetaTypeToLocalizedString(vlc_meta_Publisher), psz_provider );
-    }
@@ -799 +793 @@
-        p_pgrm->psz_now_playing = strdup( p_epg->p_current->psz_name );
-
-    vlc_mutex_lock( &p_input->p->input.p_item->lock );
-    if( p_pgrm == p_sys->p_pgrm )
-        input_item_SetNowPlaying( p_input->p->input.p_item, p_pgrm->psz_now_playing );
-    vlc_mutex_unlock( &p_input->p->input.p_item->lock );
-
-    if( p_pgrm->psz_now_playing )

src/input/input.c

@@ -255 +255 @@
-        _(VLC_META_INFO_CAT),
-        _(VLC_META_NOW_PLAYING) );
-    vlc_mutex_lock( &p_item->lock );
-    input_item_SetNowPlaying( p_item, NULL );
-    vlc_mutex_unlock( &p_item->lock );
-
-    /* */
@@ -2506 +2504 @@
-{
-    input_item_t *p_item = p_input->p->input.p_item;
-
-
+
-    char *psz_title = NULL;
-    int i;
+    int i_arturl_event = VLC_FALSE;
-
-    if( !p_meta )
-        return;
+
+    psz_arturl = input_item_GetArtURL( p_item );
-
-    vlc_mutex_lock( &p_item->lock );
@@ -2518 +2518 @@
-        psz_title = strdup( vlc_meta_Get( p_meta, vlc_meta_Title ) );
-
-    if( input_item_GetArtURL( p_item ) )
-        psz_saved_arturl = strdup( input_item_GetArtURL( p_item ) );
-
-    vlc_meta_Merge( p_item->p_meta, p_meta );
-
-
-
-
-
+
+
+
+
+
+
-    vlc_meta_Delete( p_meta );
-
-    psz_arturl = input_item_GetArtURL( p_item );
-    if( psz_arturl && !strncmp( psz_arturl, "attachment://", strlen("attachment") ) )
-    {
@@ -2535 +2533 @@
-         * XXX It can change when sout has meta data support */
-        if( p_input->p->p_sout && !p_input->b_preparsing )
-
+
+
+
+
+
-        else
-            input_ExtractAttachmentAndCacheArt( p_input );
-    }
+    free( psz_arturl );
-    
-    input_item_SetPreparsed( p_item, VLC_TRUE );
@@ -2550 +2553 @@
-    }
-    vlc_mutex_unlock( &p_item->lock );
+
+    if( i_arturl_event == VLC_TRUE )
+    {
+        vlc_event_t event;
+
+        /* Notify interested third parties */
+        event.type = vlc_InputItemMetaChanged;
+        event.u.input_item_meta_changed.meta_type = vlc_meta_ArtworkURL;
+        vlc_event_send( &p_item->event_manager, &event );
+    }
-
-    if( psz_title )

src/input/meta.c

@@ -120 +120 @@
-    int i_ret = VLC_EGENERIC;
-    module_t *p_module;
+    char *psz_name, *psz_title, *psz_artist, *psz_album;
-
-    if( !p_item->p_meta )
-        return VLC_EGENERIC;
-
-
-
+
+
+
+
+
+
-        return VLC_EGENERIC;
+    free( psz_name );
+    free( psz_title );
-
-    /* If we already checked this album in this session, skip */
-input_item_GetArtist( p_item ) && input_item_GetAlbum( p_item )
+psz_artist && psz_album
-    {
-        FOREACH_ARRAY( playlist_album_t album, p_playlist->p_fetcher->albums )
-input_item_GetArtist( p_item )
-input_item_GetAlbum( p_item )
+psz_artist
+psz_album
-            {
-                msg_Dbg( p_playlist, " %s - %s has already been searched",
-input_item_GetArtist( p_item ),  input_item_GetAlbum( p_item )
+psz_artist, psz_album
-        /* TODO-fenrir if we cache art filename too, we can go faster */
+                free( psz_artist );
+                free( psz_album );
-                if( album.b_found )
-                {
@@ -151 +160 @@
-        FOREACH_END();
-    }
-
+
+
+
+
-    input_FindArtInCache( p_playlist, p_item );
-
+
+
+
-        return 0;
+    }
+    free( psz_arturl );
-
-    PL_LOCK;
-    p_playlist->p_private = p_item;
-
+
+
+
+
+
-    {
-        msg_Dbg( p_playlist, "searching art for %s - %s",
-input_item_GetArtist( p_item ),  input_item_GetAlbum( p_item )
+psz_artist, psz_album
-    }
-    else
-    {
-        msg_Dbg( p_playlist, "searching art for %s",
-
-
+
+
+
+
-
-    p_module = module_Need( p_playlist, "art finder", 0, VLC_FALSE );
@@ -177 +199 @@
-
-    /* Record this album */
-input_item_GetArtist( p_item ) && input_item_GetAlbum( p_item )
+psz_artist && psz_album
-    {
-        playlist_album_t a;
-strdup( input_item_GetArtist( p_item ) )
-strdup( input_item_GetAlbum( p_item ) )
+psz_artist
+psz_album
-        a.b_found = (i_ret == VLC_EGENERIC ? VLC_FALSE : VLC_TRUE );
-        ARRAY_APPEND( p_playlist->p_fetcher->albums, a );
+    }
+    else
+    {
+        free( psz_artist );
+        free( psz_album );
-    }
-
@@ -281 +308 @@
-static int __input_FindArtInCache( vlc_object_t *p_obj, input_item_t *p_item )
-{
-onst c
-onst c
-onst c
+
+
+
-    char psz_filename[MAX_PATH+1];
-    int i;
@@ -294 +321 @@
-    psz_album = input_item_GetAlbum( p_item );
-    psz_title = input_item_GetTitle( p_item );
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-    for( i = 0; i < 5; i++ )
@@ -307 +341 @@
-        {
-            input_item_SetArtURL( p_item, psz_filename );
+            free( psz_artist );
+            free( psz_album );
-            return VLC_SUCCESS;
-        }
-    }
+    free( psz_artist );
+    free( psz_album );
-    return VLC_EGENERIC;
-}
@@ -325 +363 @@
-    char *psz_album = NULL;
-    char *psz_title = NULL;
+    char *psz_artist_m, *psz_album_m, *psz_title_m, *psz_name_m, *psz_arturl_m;
-    char *psz_type;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    if( !psz_title && (!psz_artist || !psz_album) )
@@ -343 +389 @@
-    }
-
-
-
-
+
+
+
+
-
-    /* */
@@ -359 +406 @@
-    free( psz_title );
-
-input_item_GetArtURL( p_item )
+psz_arturl_m
-    {
-        msg_Warn( p_playlist, "APIC fetch not supported yet" );
+        free( psz_arturl_m );
-        return VLC_EGENERIC;
-    }
-
-input_item_GetArtURL( p_item )
+psz_arturl_m
-    if( p_stream )
-    {
@@ -392 +440 @@
-        i_status = VLC_SUCCESS;
-    }
+    free( psz_arturl_m );
-    return i_status;
-}
@@ -403 +452 @@
-    char *psz_title = NULL;
-    char *psz_type = NULL;
+    char *psz_artist_m, *psz_album_m, *psz_title_m, *psz_name_m;
-    char psz_filename[MAX_PATH+1];
-    FILE *f;
@@ -412 +462 @@
-     * and then set it here to to be faster */
-
-strdup( input_item_GetArtURL( p_item )
+input_item_GetArtURL( p_item
-    if( !psz_arturl || strncmp( psz_arturl, "attachment://", strlen("attachment://") ) )
-    {
+        free( psz_arturl );
-        msg_Err( p_input, "internal input error with input_ExtractAttachmentAndCacheArt" );
-        return;
@@ -446 +497 @@
-    }
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    if( (!psz_artist || !psz_album ) && !psz_title )

src/playlist/control.c

@@ -455 +455 @@
-        vlc_bool_t b_has_art;
-
-
-
-
-
+
+
+
+
+
+
-
-        if( !b_has_art )
-        {
-_input->p
+
-            playlist_AskForArtEnqueue( p_playlist, p_input );
-        }
+        free( psz_arturl );
+        free( psz_name );
-    }
-

src/playlist/engine.c

@@ -528 +528 @@
-             * \todo don't do this for things we won't get meta for, like vids
-             */
+            char *psz_arturl = input_item_GetArtURL( p_current );
+            char *psz_name = input_item_GetName( p_current );
-            if( !input_MetaSatisfied( p_playlist, p_current, &i_m, &i_o ) )
-            {
@@ -543 +545 @@
-            /* We already have all needed meta, but we need art right now */
-            else if( p_playlist->p_fetcher->i_art_policy == ALBUM_ART_ALL &&
-input_item_GetArtURL( p_current )
+psz_arturl
-            {
-                preparse_item_t p;
-
-
+
-                p.p_item = p_current;
-                p.b_fetch_art = VLC_TRUE;
@@ -560 +561 @@
-            {
-                PL_DEBUG( "no fetch required for %s (art currently %s)",
-
-
+
-                vlc_gc_decref( p_current );
-            }
+            free( psz_name );
+            free( psz_arturl );
-            PL_UNLOCK;
-        }

src/playlist/item.c

@@ -658 +658 @@
-    }
-    /* Preparse if PREPARSE or SPREPARSE & not enough meta */
+    char *psz_artist = input_item_GetArtist( p_item_cat->p_input );
+    char *psz_album = input_item_GetAlbum( p_item_cat->p_input );
-    if( p_playlist->b_auto_preparse &&
-          (i_mode & PLAYLIST_PREPARSE ||
-          ( i_mode & PLAYLIST_SPREPARSE &&
-
-
+
-          ) ) )
-        playlist_PreparseEnqueue( p_playlist, p_item_cat->p_input );
-    /* If we already have it, signal it */
-
-
+
-        input_item_SetPreparsed( p_item_cat->p_input, VLC_TRUE );
+    free( psz_artist );
+    free( psz_album );
-}
-

src/text/strings.c

@@ -639 +639 @@
-
-#define INSERT_STRING( check, string )                              \
-&& string )
+)          
-                    {                                               \
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    }
-char *__str_format_meta( vlc_object_t *p_object, const char *string )
@@ -682 +687 @@
-            switch( *s )
-            {
+                char *psz_meta; /* used by INSERT_STRING */
-                case 'a':
-                    INSERT_STRING( p_item, input_item_GetArtist(p_item) );

src/video_output/video_output.c

@@ -1643 +1643 @@
-        i_now = mdate();
-        i_stop = i_now + (mtime_t)(p_vout->i_title_timeout * 1000);
-
+
+
+
+
+
-        {
-            vout_ShowTextAbsolute( p_vout, DEFAULT_CHAN,
-input_item_GetNowPlaying(input_GetItem(p_input))
+psz_nowplaying
-                                   p_vout->i_title_position,
-                                   30 + p_vout->fmt_in.i_width
@@ -1654 +1658 @@
-                                   i_now, i_stop );
-        }
-input_item_GetArtist(input_GetItem(p_input))
+ psz_artist 
-        {
-            char *psz_string = NULL;
-
-
-
+
-            if( psz_string )
-            {
-
-
-
+
-
-                vout_ShowTextAbsolute( p_vout, DEFAULT_CHAN,
@@ -1680 +1681 @@
-        {
-            vout_ShowTextAbsolute( p_vout, DEFAULT_CHAN,
-input_GetItem(p_input)->
+
-                                   p_vout->i_title_position,
-                                   30 + p_vout->fmt_in.i_width
@@ -1689 +1690 @@
-        }
-        vlc_object_release( p_input );
-
-
+
+
+
+
+