Changeset 7116

Show
Ignore:
Timestamp:
01/28/10 01:01:43 (7 months ago)
Author:
metamorph68
Message:

Restored taglib and vorbisduration..

Location:
trunk/liquidsoap/src
Files:
1 modified
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/liquidsoap/src/Makefile

    r7114 r7116  
    3434# TODO move all formats to encoders 
    3535formats = \ 
    36         $(if $(W_VORBIS),formats/vorbisduration.ml) \ 
    37         $(if $(W_TAGLIB),formats/taglib_plug.ml) \ 
    3836        formats/externalformat.ml \ 
    3937        formats/midiformat.ml \ 
    … …  
    4341        formats/wavformat.ml \ 
    4442        $(if $(W_OGG),decoder/ogg_decoder.ml) \ 
    45         $(if $(W_MP3),decoder/mp3.ml) 
     43        $(if $(W_MP3),decoder/mp3.ml) \ 
     44        $(if $(W_VORBIS),decoder/vorbisduration.ml) \ 
     45        $(if $(W_TAGLIB),decoder/taglib_plug.ml) 
    4646 
    4747playlists = \ 

  • trunk/liquidsoap/src/decoder/taglib_plug.ml

    r6664 r7116  
    2323open Taglib 
    2424 
    25 let get_tags ~format fname = 
    26   if format <> "MP3" then [] else 
     25let get_tags fname = 
    2726  try 
    2827    let f = open_file ~file_type:Mpeg fname in