Skip to content

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

Factorizes code

parent dae7ad5a
Show whitespace changes
Inline Side-by-side
Showing with 160 additions and 156 deletions
modules/meta_engine/taglib.cpp
View file @ a1c8d9cf
...@@ -41,7 +41,9 @@ ...@@ -41,7 +41,9 @@
#include <vorbisproperties.h> #include <vorbisproperties.h>
#include <uniquefileidentifierframe.h> #include <uniquefileidentifierframe.h>
#include <textidentificationframe.h> #include <textidentificationframe.h>
//#include <relativevolumeframe.h> /* parse the tags without taglib helpers? */ #if 0 /* parse the tags without taglib helpers? */
#include <relativevolumeframe.h>
#endif
static int ReadMeta ( vlc_object_t * ); static int ReadMeta ( vlc_object_t * );
static int DownloadArt ( vlc_object_t * ); static int DownloadArt ( vlc_object_t * );
...@@ -96,96 +98,20 @@ static int ReadMeta( vlc_object_t *p_this ) ...@@ -96,96 +98,20 @@ static int ReadMeta( vlc_object_t *p_this )
{ {
demux_t *p_demux = (demux_t *)p_this; demux_t *p_demux = (demux_t *)p_this;
if( !strncmp( p_demux->psz_access, "file", 4 ) ) if( strncmp( p_demux->psz_access, "file", 4 ) )
{ return VLC_EGENERIC;
if( !p_demux->p_private )
p_demux->p_private = (void*)vlc_meta_New();
TagLib::FileRef f( p_demux->psz_path );
if( !f.isNull() ) TagLib::FileRef f( p_demux->psz_path );
{ if( f.isNull() )
if( TagLib::Ogg::Vorbis::File *p_ogg_v = return VLC_EGENERIC;
dynamic_cast<TagLib::Ogg::Vorbis::File *>(f.file() ) )
{
int i_ogg_v_length = p_ogg_v->audioProperties()->length();
input_thread_t *p_input = (input_thread_t *)vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT ); if ( !f.tag() || f.tag()->isEmpty() )
if( p_input ) return VLC_EGENERIC;
{
input_item_t *p_item = input_GetItem( p_input );
if( p_item )
{
vlc_mutex_lock( &p_item->lock );
p_item->i_duration = i_ogg_v_length * 1000000;
vlc_mutex_unlock( &p_item->lock );
}
vlc_object_release( p_input );
}
}
#if 0 /* at this moment, taglib is unable to detect ogg/flac files
* becauses type detection is based on file extension:
* ogg = ogg/vorbis
* flac = flac
* ø = ogg/flac
*/
else if( TagLib::Ogg::FLAC::File *p_ogg_f =
dynamic_cast<TagLib::Ogg::FLAC::File *>(f.file() ) )
{
long i_ogg_f_length = p_ogg_f->streamLength();
input_thread_t *p_input = (input_thread_t *)vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT );
if( p_input )
{
input_item_t *p_item = input_GetItem( p_input );
if( p_item )
{
vlc_mutex_lock( &p_item->lock );
p_item->i_duration = i_ogg_f_length * 1000000;
vlc_mutex_unlock( &p_item->lock );
}
vlc_object_release( p_input );
}
}
#endif
else if( TagLib::FLAC::File *p_flac =
dynamic_cast<TagLib::FLAC::File *>(f.file() ) )
{
long i_flac_length = p_flac->audioProperties()->length();
input_thread_t *p_input = (input_thread_t *)vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT );
if( p_input )
{
input_item_t *p_item = input_GetItem( p_input );
if( p_item )
{
vlc_mutex_lock( &p_item->lock );
p_item->i_duration = i_flac_length * 1000000;
vlc_mutex_unlock( &p_item->lock );
}
vlc_object_release( p_input );
}
}
}
if( !f.isNull() && f.tag() && !f.tag()->isEmpty() ) if( !p_demux->p_private )
{ p_demux->p_private = (void*)vlc_meta_New();
TagLib::Tag *tag = f.tag();
vlc_meta_t *p_meta = (vlc_meta_t *)(p_demux->p_private ); vlc_meta_t *p_meta = (vlc_meta_t *)(p_demux->p_private );
TagLib::Tag *tag = f.tag();
#define SET( foo, bar ) vlc_meta_Set##foo( p_meta, tag->bar ().toCString(true))
#define SETINT( foo, bar ) { \
char psz_tmp[10]; \
snprintf( (char*)psz_tmp, 10, "%d", tag->bar() ); \
vlc_meta_Set##foo( p_meta, (char*)psz_tmp ); \
}
SET( Title, title );
SET( Artist, artist );
SET( Album, album );
SET( Description, comment );
SET( Genre, genre );
SETINT( Date, year );
SETINT( Tracknum , track );
#undef SET
#undef SETINT
if( TagLib::MPEG::File *p_mpeg = if( TagLib::MPEG::File *p_mpeg =
dynamic_cast<TagLib::MPEG::File *>(f.file() ) ) dynamic_cast<TagLib::MPEG::File *>(f.file() ) )
...@@ -254,12 +180,12 @@ static int ReadMeta( vlc_object_t *p_this ) ...@@ -254,12 +180,12 @@ static int ReadMeta( vlc_object_t *p_this )
memcpy( psz_tag, p_t->frameID().data(), 4); memcpy( psz_tag, p_t->frameID().data(), 4);
#define SET( foo, bar ) if( !strncmp( psz_tag, foo, 4 ) ) \ #define SET( foo, bar ) if( !strncmp( psz_tag, foo, 4 ) ) \
vlc_meta_Set##bar( p_meta, p_t->toString().toCString(true)) vlc_meta_Set##bar( p_meta, p_t->toString().toCString(true))
SET( "TPUB", Publisher ); SET( "TPUB", Publisher );
SET( "TCOP", Copyright ); SET( "TCOP", Copyright );
SET( "TENC", EncodedBy ); SET( "TENC", EncodedBy );
SET( "TLAN", Language ); SET( "TLAN", Language );
//SET( "POPM", Rating ); //SET( "POPM", Rating ); /* rating needs special handling in id3v2 */
//if( !strncmp( psz_tag, "RVA2", 4 ) ) //if( !strncmp( psz_tag, "RVA2", 4 ) )
/* TODO */ /* TODO */
#undef SET #undef SET
...@@ -267,12 +193,90 @@ static int ReadMeta( vlc_object_t *p_this ) ...@@ -267,12 +193,90 @@ static int ReadMeta( vlc_object_t *p_this )
} }
} }
DetectImage( f, p_meta ); else if( TagLib::Ogg::Vorbis::File *p_ogg_v =
dynamic_cast<TagLib::Ogg::Vorbis::File *>(f.file() ) )
{
int i_ogg_v_length = p_ogg_v->audioProperties()->length();
return VLC_SUCCESS; input_thread_t *p_input = (input_thread_t *)
vlc_object_find( p_demux,VLC_OBJECT_INPUT, FIND_PARENT );
if( p_input )
{
input_item_t *p_item = input_GetItem( p_input );
if( p_item )
{
vlc_mutex_lock( &p_item->lock );
p_item->i_duration = i_ogg_v_length * 1000000;
vlc_mutex_unlock( &p_item->lock );
} }
vlc_object_release( p_input );
} }
return VLC_EGENERIC;
}
#if 0 /* at this moment, taglib is unable to detect ogg/flac files
* becauses type detection is based on file extension:
* ogg = ogg/vorbis
* flac = flac
* ø = ogg/flac
*/
else if( TagLib::Ogg::FLAC::File *p_ogg_f =
dynamic_cast<TagLib::Ogg::FLAC::File *>(f.file() ) )
{
long i_ogg_f_length = p_ogg_f->streamLength();
input_thread_t *p_input = (input_thread_t *)
vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT );
if( p_input )
{
input_item_t *p_item = input_GetItem( p_input );
if( p_item )
{
vlc_mutex_lock( &p_item->lock );
p_item->i_duration = i_ogg_f_length * 1000000;
vlc_mutex_unlock( &p_item->lock );
}
vlc_object_release( p_input );
}
}
#endif
else if( TagLib::FLAC::File *p_flac =
dynamic_cast<TagLib::FLAC::File *>(f.file() ) )
{
long i_flac_length = p_flac->audioProperties()->length();
input_thread_t *p_input = (input_thread_t *)
vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT );
if( p_input )
{
input_item_t *p_item = input_GetItem( p_input );
if( p_item )
{
vlc_mutex_lock( &p_item->lock );
p_item->i_duration = i_flac_length * 1000000;
vlc_mutex_unlock( &p_item->lock );
}
vlc_object_release( p_input );
}
}
#define SET( foo, bar ) vlc_meta_Set##foo( p_meta, tag->bar ().toCString(true))
#define SETINT( foo, bar ) { \
char psz_tmp[10]; \
snprintf( (char*)psz_tmp, 10, "%d", tag->bar() ); \
vlc_meta_Set##foo( p_meta, (char*)psz_tmp ); \
}
SET( Title, title );
SET( Artist, artist );
SET( Album, album );
SET( Description, comment );
SET( Genre, genre );
SETINT( Date, year );
SETINT( Tracknum , track );
#undef SET
#undef SETINT
DetectImage( f, p_meta );
return VLC_SUCCESS;
} }
#define SET(a,b) if(b) { \ #define SET(a,b) if(b) { \
......
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