Changeset 38dbd37adf32cf04e1caf17ceb7888a4a5ec2f40

Timestamp:

18/08/07 05:22:03 (1 year ago)

Author:

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

git-committer:

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

git-parent:

[a9d17dba883714d98580639980f3142317a22e69]

git-author:

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

Message:

Input access locking. Part one

Files:

• include/vlc_input.h (modified) (2 diffs)
• modules/control/dbus.c (modified) (1 diff)
• modules/demux/flac.c (modified) (2 diffs)
• modules/gui/macosx/playlist.m (modified) (1 diff)
• modules/gui/qt4/components/infopanels.cpp (modified) (5 diffs)
• modules/gui/qt4/input_manager.cpp (modified) (1 diff)
• modules/gui/qt4/playlist_model.cpp (modified) (4 diffs)
• modules/gui/wxwidgets/dialogs/infopanels.cpp (modified) (2 diffs)
• modules/gui/wxwidgets/dialogs/playlist.cpp (modified) (1 diff)
• modules/gui/wxwidgets/input_manager.cpp (modified) (2 diffs)
• modules/gui/wxwidgets/playlist_manager.cpp (modified) (2 diffs)
• modules/meta_engine/luameta.c (modified) (2 diffs)
• modules/meta_engine/musicbrainz.c (modified) (3 diffs)
• modules/meta_engine/taglib.cpp (modified) (1 diff)
• modules/misc/audioscrobbler.c (modified) (4 diffs)
• src/control/media_descriptor.c (modified) (2 diffs)
• src/playlist/search.c (modified) (1 diff)
• src/playlist/sort.c (modified) (2 diffs)

include/vlc_input.h

@@ -222 +222 @@
-{
-    vlc_event_t event;
+    vlc_mutex_lock( &p_i->p_lock );
-    if( !p_i->p_meta )
-        p_i->p_meta = vlc_meta_New();
-    vlc_meta_Set( p_i->p_meta, meta_type, psz_val );
+    vlc_mutex_unlock( &p_i->p_lock ); 
-
-    /* Notify interested third parties */
@@ -232 +234 @@
-}
-
-
-
+
+
+
-    if( !p_i->p_meta )
+    {
+        vlc_mutex_unlock( &p_i->p_lock );
-        return NULL;
-
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

modules/control/dbus.c

@@ -867 +867 @@
-#define ADD_VLC_META_STRING( entry, item ) \
-    { \
-onst c
+
-        ADD_META( entry, DBUS_TYPE_STRING, \
-                  psz ); \
+        free( psz ); \
-    }
-

modules/demux/flac.c

@@ -621 +621 @@
-    if( !strncasecmp(psz, txt, strlen(txt)) ) \
-    { \
-onst c
+
-        if( oldval ) \
-        { \
@@ -631 +631 @@
-        else \
-            vlc_meta_Set( p_sys->p_meta, vlc_meta_ ## var, &psz[strlen(txt)] ); \
+        free( oldval ); \
-    }
-        IF_EXTRACT("TITLE=", Title )

modules/gui/macosx/playlist.m

@@ -272 +272 @@
-    {
-        /* sanity check to prevent the NSString class from crashing */
-
-
-
+
+
+
+
-            if( o_value == NULL )
-input_item_GetTitle( p_item->p_input
+psz_title
-        } 
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            if( o_value == NULL )
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-

modules/gui/qt4/components/infopanels.cpp

@@ -189 +189 @@
-void MetaPanel::update( input_item_t *p_item )
-{
-onst c
+
-#define UPDATE_META( meta, widget ) {               \
-    psz_meta = input_item_Get##meta( p_item );      \
@@ -195 +195 @@
-        widget->setText( qfu( psz_meta ) );         \
-    else                                            \
-
+
+
-
-#define UPDATE_META_INT( meta, widget ) {           \
-    psz_meta = input_item_Get##meta( p_item );      \
-    if( !EMPTY_STR( psz_meta ) )                    \
-
+
+
+
-
-    /* Name / Title */
@@ -209 +212 @@
-        title_text->setText( qfu( p_item->psz_name ) );
-    else title_text->setText( "" );
+    free( psz_meta );
-
-    /* URL / URI */
@@ -216 +220 @@
-    else if( !EMPTY_STR( p_item->psz_uri ) )
-        emit uriSet( QString( p_item->psz_uri ) );
+    free( psz_meta );
-
-    /* Other classic though */
@@ -244 +249 @@
-    else
-        art_cover->setPixmap( QPixmap( ":/noart.png" ) );
+    free( psz_meta );
-}
-

modules/gui/qt4/input_manager.cpp

@@ -133 +133 @@
-    /* Update text */
-    QString text;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    }
-    else
-    {
-
-
+
+
+
+
+
-    if( old_name != text )
-    {

modules/gui/qt4/playlist_model.cpp

@@ -21 +21 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-#define PLI_NAME( p ) p ? p->p_input->psz_name : "null"
-
-#include <assert.h>
@@ -185 +184 @@
-    current = iscurrent;
-
-
-
-
+
+
+
+
-    else if( current )
-        model->removeArt();
+    free( psz_arturl );
-
-    strings.clear();
@@ -199 +200 @@
-    }
-
-
+
-#define ADD_META( item, meta ) \
-
+
+
+
-
-    for( int i_index=1; i_index <= VLC_META_ENGINE_MB_TRM_ID; i_index = i_index * 2 )
@@ -213 +216 @@
-                    break;
-                case VLC_META_ENGINE_TITLE:
-
+
+
+
+
-                    {
-                        ADD_META( p_item, Title );
-                    } else {
-_item->p_input->p
+
-                    }
+                    free( psz_title );
+                    free( psz_name );
-                    break;
-                case VLC_META_ENGINE_DESCRIPTION:

modules/gui/wxwidgets/dialogs/infopanels.cpp

@@ -122 +122 @@
-
-#define UPDATE_META( meta, widget ) {                                       \
-onst char *psz_meta = input_item_Get##meta( p_item );
+har *psz_meta = input_item_Get##meta( p_item );      
-    if( psz_meta != NULL && *psz_meta)                                      \
-    {                                                                       \
@@ -128 +128 @@
-    }                                                                       \
-    else { widget->SetLabel( wxU( "-" ) ); }                                \
-
+
+
-
-    UPDATE_META( Artist, artist_text );

modules/gui/wxwidgets/dialogs/playlist.cpp

@@ -514 +514 @@
-
-    char *psz_artist;
-
-
-
+
-
-    char psz_duration[MSTRTIME_MAX_SIZE];

modules/gui/wxwidgets/input_manager.cpp

@@ -211 +211 @@
-void InputManager::UpdateNowPlaying()
-{
-onst c
+
-    if( psz_now_playing && *psz_now_playing )
-    {
@@ -223 +223 @@
-                   wxU(input_GetItem(p_input)->psz_name), 2 );
-    }
+    free( psz_now_playing );
-}
-

modules/gui/wxwidgets/playlist_manager.cpp

@@ -300 +300 @@
-    wxString duration = wxU( "" );
-
-onst c
+
-    if( ! psz_artist )
-    {
@@ -325 +325 @@
-                    wxString(wxU(p_item->p_input->psz_name)) + duration;
-    }
+    free( psz_artist );
-    treectrl->SetItemText( item , msg );
-    treectrl->SetItemImage( item, p_item->p_input->i_type );

modules/meta_engine/luameta.c

@@ -251 +251 @@
-        return NULL;
-    }
+    char *psz_meta;
-
-    /* Load Lua libraries */
@@ -259 +260 @@
-    lua_pushlightuserdata( p_state, p_this );
-    lua_setfield( p_state, lua_gettop( p_state ) - 1, "private" );
-
-
+
+
+
-    lua_setfield( p_state, lua_gettop( p_state ) - 1, "name" );
-
-
+
+
+
+
-    lua_setfield( p_state, lua_gettop( p_state ) - 1, "title" );
-
-
+
+
+
+
-    lua_setfield( p_state, lua_gettop( p_state ) - 1, "album" );
-
-
+
+
+
+
-    lua_setfield( p_state, lua_gettop( p_state ) - 1, "arturl" );
-
+
+
-
-    return p_state;

modules/meta_engine/musicbrainz.c

@@ -78 +78 @@
-    char *ppsz_args[4];
-
-    char *psz_title;
-    char *psz_artist;
-    char *psz_album;
@@ -84 +83 @@
-    psz_artist = input_item_GetArtist( p_item );
-    psz_album = input_item_GetAlbum( p_item );
-    psz_title = p_item->psz_name;
-
-    if( !psz_artist || !psz_album )
+    {
+        free( psz_artist );
+        free( psz_album );
-        return VLC_EGENERIC;
+    }
+    free( psz_artist );
+    free( psz_album );
-
-    musicbrainz_t p_mb;
@@ -155 +159 @@
-        return VLC_SUCCESS;
-    else
-
-
+
+
+
+
+
+
+
-}
-

modules/meta_engine/taglib.cpp

@@ -194 +194 @@
-        TagLib::Tag *tag = f.tag();
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-            TagLib::String::UTF8 );
-        tag->setTitle( *psz_title );
-        delete psz_title;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        f.save();

modules/misc/audioscrobbler.c

@@ -631 +631 @@
-    p_sys->p_current_song->time_playing = epoch;
-
-
+
+
-                      ? VLC_TRUE : VLC_FALSE;
+    free( psz_name );
-
-    vlc_mutex_unlock( &p_sys->lock );
@@ -1004 +1006 @@
-    var_Change( p_input, "video-es", VLC_VAR_CHOICESCOUNT, &video_val, NULL );
-    if( ( video_val.i_int > 0 ) || \
-p_input
+ p_input 
-    {
-        msg_Dbg( p_this, "Not an audio only local file -> no submission");
@@ -1039 +1041 @@
-        }
-
+    char *psz_meta;
-    #define ALLOC_ITEM_META( a, b ) \
-
+
+
-        { \
-
-
+
-            if( !a ) \
-            { \
+                free( psz_meta ); \
-                FREE_INPUT_AND_CHARS \
-                return VLC_ENOMEM; \
-            } \
+            free( psz_meta ); \
-        }
-
@@ -1065 +1070 @@
-            WAIT_METADATA_FETCHING( psz_artist )
-        }
-
-input_GetItem(p_input)->psz_name
+
+psz_meta
-        {
-input_GetItem(p_input)->psz_name
+psz_meta
-            if( !psz_title )
-            {
+                free( psz_meta );
-                FREE_INPUT_AND_CHARS
-                return VLC_ENOMEM;
-            }
+            free( psz_meta );
-        }
-        else

src/control/media_descriptor.c

@@ -277 +277 @@
-                                         libvlc_exception_t *p_e )
-{
-onst c
+
-
-    /* XXX: locking */
@@ -288 +288 @@
-    /* Should be integrated in core */
-    if( !psz_meta && e_meta == libvlc_meta_Title && p_md->p_input_item->psz_name )
+    {
+        free( psz_meta );
-        return strdup( p_md->p_input_item->psz_name );
+    }
-
-    if( !psz_meta )
-
-
-
-
-
+
+
+
+
+
+
+
+

src/playlist/search.c

@@ -121 +121 @@
-            playlist_LiveSearchUpdate( p_playlist, p_item, psz_string );
-        }
-#define META_MATCHES( field ) ( input_item_GetMeta( p_item->p_input, vlc_meta_##field ) && \
-                                strcasestr( input_item_GetMeta( p_item->p_input, vlc_meta_##field ), psz_string ) )
-        else
-        {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                p_item->i_flags &= ~PLAYLIST_DBL_FLAG;
-            else

src/playlist/sort.c

@@ -106 +106 @@
-
-#define DO_META_SORT( node ) { \
-onst c
-onst c
+
+
-    /* Nodes go first */ \
-    if( pp_items[i]->i_children == -1 && pp_items[i_small]->i_children >= 0 ) \
@@ -199 +199 @@
-        pp_items[i_small] = p_temp;
-    }
+    free( psz_a );
+    free( psz_b );
-    return VLC_SUCCESS;
-}