Skip to content

V
vlc-2-2
Commit 8675d26c authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

taglib is not thread-safe 

Fix ticket #3958
parent 2ad5d811
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
modules/meta_engine/taglib.cpp
View file @ 8675d26c
...@@ -77,6 +77,8 @@ ...@@ -77,6 +77,8 @@
#include <textidentificationframe.h> #include <textidentificationframe.h>
#include <uniquefileidentifierframe.h> #include <uniquefileidentifierframe.h>
// taglib is not thread safe
static vlc_mutex_t taglib_lock = VLC_STATIC_MUTEX;
// Local functions // Local functions
static int ReadMeta ( vlc_object_t * ); static int ReadMeta ( vlc_object_t * );
...@@ -363,6 +365,7 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_t *p_demux, demux_meta_t *p_de ...@@ -363,6 +365,7 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_t *p_demux, demux_meta_t *p_de
*/ */
static int ReadMeta( vlc_object_t* p_this) static int ReadMeta( vlc_object_t* p_this)
{ {
vlc_mutex_locker locker (&taglib_lock);
demux_meta_t* p_demux_meta = (demux_meta_t *)p_this; demux_meta_t* p_demux_meta = (demux_meta_t *)p_this;
demux_t* p_demux = p_demux_meta->p_demux; demux_t* p_demux = p_demux_meta->p_demux;
vlc_meta_t* p_meta; vlc_meta_t* p_meta;
...@@ -585,6 +588,7 @@ static void WriteMetaToXiph( Ogg::XiphComment* tag, input_item_t* p_item ) ...@@ -585,6 +588,7 @@ static void WriteMetaToXiph( Ogg::XiphComment* tag, input_item_t* p_item )
static int WriteMeta( vlc_object_t *p_this ) static int WriteMeta( vlc_object_t *p_this )
{ {
vlc_mutex_locker locker (&taglib_lock);
meta_export_t *p_export = (meta_export_t *)p_this; meta_export_t *p_export = (meta_export_t *)p_this;
input_item_t *p_item = p_export->p_item; input_item_t *p_item = p_export->p_item;
FileRef f; FileRef f;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment