[vlc-devel] [PATCH 1/7] Add support for updating Opus metadata

[Jean-Baptiste Kempf]

Applied with a slightly different log :)

On 02 Sep, Timothy B. Terriberry wrote :

> >From a425a71cb14cd3da86b1dfef456d46c60e694d62 Mon Sep 17 00:00:00 2001
> From: "Timothy B. Terriberry" <tterribe at xiph.org>
> Date: Mon, 2 Sep 2013 07:53:37 -0700
> Subject: [PATCH 1/7] Add support for updating Opus metadata.
> 
> This requires a taglib version with Opus support, but such a
> version has not yet been relesed, even though support has been in
> git almost a year. Presumably such a version will be 1.9.
> ---
>  modules/meta_engine/taglib.cpp | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
> diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
> index 62c30dd..1be894c 100644
> --- a/modules/meta_engine/taglib.cpp
> +++ b/modules/meta_engine/taglib.cpp
> @@ -64,16 +64,20 @@
>  # define TAGLIB_HAVE_APEFILE_H
>  # include <apefile.h>
>  # ifdef TAGLIB_WITH_ASF                     // ASF pictures comes with v1.7.0
>  #  define TAGLIB_HAVE_ASFPICTURE_H
>  #  include <asffile.h>
>  # endif
>  #endif
>  
> +#if TAGLIB_VERSION >= VERSION_INT(1,9,0)
> +# include <opusfile.h>
> +#endif
> +
>  #include <apetag.h>
>  #include <flacfile.h>
>  #include <mpcfile.h>
>  #include <mpegfile.h>
>  #include <oggfile.h>
>  #include <oggflacfile.h>
>  #include "../demux/xiph_metadata.h"
>  
> @@ -638,16 +642,20 @@ static int ReadMeta( vlc_object_t* p_this)
>      else if( dynamic_cast<Ogg::File*>(f.file()) )
>      {
>          if( Ogg::FLAC::File* ogg_flac = dynamic_cast<Ogg::FLAC::File*>(f.file()))
>              ReadMetaFromXiph( ogg_flac->tag(), p_demux_meta, p_meta );
>          else if( Ogg::Speex::File* ogg_speex = dynamic_cast<Ogg::Speex::File*>(f.file()) )
>              ReadMetaFromXiph( ogg_speex->tag(), p_demux_meta, p_meta );
>          else if( Ogg::Vorbis::File* ogg_vorbis = dynamic_cast<Ogg::Vorbis::File*>(f.file()) )
>              ReadMetaFromXiph( ogg_vorbis->tag(), p_demux_meta, p_meta );
> +#if defined(TAGLIB_OPUSFILE_H)
> +        else if( Ogg::Opus::File* ogg_opus = dynamic_cast<Ogg::Opus::File*>(f.file()) )
> +            ReadMetaFromXiph( ogg_opus->tag(), p_demux_meta, p_meta );
> +#endif
>      }
>      else if( dynamic_cast<RIFF::File*>(f.file()) )
>      {
>          if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
>              ReadMetaFromId3v2( riff_aiff->tag(), p_demux_meta, p_meta );
>          else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
>              ReadMetaFromId3v2( riff_wav->tag(), p_demux_meta, p_meta );
>      }
> @@ -947,16 +955,20 @@ static int WriteMeta( vlc_object_t *p_this )
>      else if( dynamic_cast<Ogg::File*>(f.file()) )
>      {
>          if( Ogg::FLAC::File* ogg_flac = dynamic_cast<Ogg::FLAC::File*>(f.file()))
>              WriteMetaToXiph( ogg_flac->tag(), p_item );
>          else if( Ogg::Speex::File* ogg_speex = dynamic_cast<Ogg::Speex::File*>(f.file()) )
>              WriteMetaToXiph( ogg_speex->tag(), p_item );
>          else if( Ogg::Vorbis::File* ogg_vorbis = dynamic_cast<Ogg::Vorbis::File*>(f.file()) )
>              WriteMetaToXiph( ogg_vorbis->tag(), p_item );
> +#if defined(TAGLIB_OPUSFILE_H)
> +        else if( Ogg::Opus::File* ogg_opus = dynamic_cast<Ogg::Opus::File*>(f.file()) )
> +            WriteMetaToXiph( ogg_opus->tag(), p_item );
> +#endif
>      }
>      else if( dynamic_cast<RIFF::File*>(f.file()) )
>      {
>          if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
>              WriteMetaToId3v2( riff_aiff->tag(), p_item );
>          else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
>              WriteMetaToId3v2( riff_wav->tag(), p_item );
>      }
> -- 
> 1.7.12
> 

> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel


-- 
Best regards,

-- 
Jean-Baptiste Kempf
http://www.jbkempf.com/ - +33 672 704 734
Sent from my Electronic Device