Changeset 7127

Timestamp:

01/30/10 07:16:12 (7 months ago)

Author:

dbaelde

Message:

Finish the migration of the wav decoder. I removed the debugging code, the only problem with it was due to Rutils.

Location:

trunk/liquidsoap/src

Files:

• Makefile (modified) (1 diff)
• decoder/wav_decoder.ml (moved) (moved from trunk/liquidsoap/src/formats/wavformat.ml) (2 diffs)

trunk/liquidsoap/src/Makefile

@@ -39 +39 @@
 
 decoders = \
-        formats/wavformat.ml \
+        decoder/wav_decoder.ml \
         $(if $(W_OGG),decoder/ogg_decoder.ml) \
         $(if $(W_MP3),decoder/mp3.ml) \

trunk/liquidsoap/src/decoder/wav_decoder.ml

@@ -56 +56 @@
 struct
 
-(* TODO It might be more efficient to write our code for an input
+(* It might be more efficient to write our code for an input
  * channel and use directly the one we have when decoding files
  * or external processes, if we could wrap the input function used
@@ -67 +67 @@
     let data,bytes = input bytes_to_get in
       if bytes=0 then raise End_of_stream ;
-      log#f 4 "Read %d bytes of PCM" bytes ;
       let content,length = converter (String.sub data 0 bytes) in
         Generator.set_mode gen `Audio ;
-        Generator.put_audio gen content 0 length ;
-        log#f 4 "Done (%d)" length
+        Generator.put_audio gen content 0 length
   in