[vlc-commits] taglib: cosmetics.
Rémi Duraffort
git at videolan.org
Sat Jun 4 12:37:29 CEST 2011
vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Sat Jun 4 12:33:09 2011 +0200| [d158270ed7e2a3c1aea9fa137e65a42600e94f44] | committer: Rémi Duraffort
taglib: cosmetics.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d158270ed7e2a3c1aea9fa137e65a42600e94f44
---
modules/meta_engine/taglib.cpp | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index ae6cf2a..f226a1c 100644
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -1,7 +1,7 @@
/*****************************************************************************
* taglib.cpp: Taglib tag parser/writer
*****************************************************************************
- * Copyright (C) 2003-2009 the VideoLAN team
+ * Copyright (C) 2003-2011 the VideoLAN team
* $Id$
*
* Authors: Clément Stenac <zorglub at videolan.org>
@@ -127,7 +127,6 @@ static void ReadMetaFromAPE( APE::Tag* tag, demux_meta_t*, vlc_meta_t* p_meta )
}
-
/**
* Read meta information from id3v2 tags
* @param tag: the id3v2 tag
@@ -291,7 +290,6 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_meta_t* p_demux_meta, vlc_
}
-
/**
* Read the meta information from XiphComments
* @param tag: the Xiph Comment
@@ -344,7 +342,14 @@ static void ReadMetaFromXiph( Ogg::XiphComment* tag, demux_meta_t* p_demux_meta,
vlc_meta_SetArtURL( p_meta, "attachment://cover" );
}
+
#if defined(TAGLIB_WITH_MP4) && defined(HAVE_TAGLIB_MP4COVERART_H)
+/**
+ * Read the meta information from mp4 specific tags
+ * @param tag: the mp4 tag
+ * @param p_demux_meta: the demuxer meta
+ * @param p_meta: the meta
+ */
static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta_t* p_meta )
{
if( tag->itemListMap().contains("covr") )
@@ -367,6 +372,7 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
}
#endif
+
/**
* Get the tags from the file using TagLib
* @param p_this: the demux object
@@ -513,7 +519,6 @@ static int ReadMeta( vlc_object_t* p_this)
}
-
/**
* Write meta information to APE tags
* @param tag: the APE tag
@@ -540,7 +545,6 @@ static void WriteMetaToAPE( APE::Tag* tag, input_item_t* p_item )
}
-
/**
* Write meta information to id3v2 tags
* @param tag: the id3v2 tag
@@ -571,7 +575,6 @@ static void WriteMetaToId3v2( ID3v2::Tag* tag, input_item_t* p_item )
}
-
/**
* Write the meta information to XiphComments
* @param tag: the Xiph Comment
@@ -596,7 +599,6 @@ static void WriteMetaToXiph( Ogg::XiphComment* tag, input_item_t* p_item )
}
-
/**
* Set the tags to the file using TagLib
* @param p_this: the demux object
More information about the vlc-commits
mailing list