From 6f2fefdd9ff5f8561b3538efb5eb0765a9b4a141 Mon Sep 17 00:00:00 2001 From: Vegard Storheil Eriksen Date: Thu, 6 Jan 2011 05:29:39 +0100 Subject: Replaced iostream-based decoder-encoder chain with direct chain. --- music.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'music.cpp') diff --git a/music.cpp b/music.cpp index 3e0ac14..3faa10b 100644 --- a/music.cpp +++ b/music.cpp @@ -1,7 +1,6 @@ #include "music.h" #include "decoder.h" #include "encoder.h" -#include "transcode.h" #include "tag.h" #include "config.h" @@ -238,10 +237,18 @@ void MusicTrack::render(HTTP::Connection::p req) { req->add_header("content-type", "application/octet-stream"); if(req->args.count("decoder") && req->args.count("encoder")) { - DecoderFilter::p d = decoder::get_decoder(req->args["decoder"]); - EncoderFilter::p e = encoder::get_encoder(req->args["encoder"]); - Transcoder t(path.string(), req, d, e); - t.run(); + Decoder::p decoder = Decoder::get(req->args["decoder"], path.string()); + Encoder::p encoder = Encoder::get(req->args["encoder"], decoder); + + // TODO: Make an encoder-to-istream adapter to get rid of this: + char data[0x1000]; + std::streamsize size = 1; + while(size) { + size = encoder->read(data, 0x1000); + if(size > 0) + req->send_data(data, size); + } + } else { fs::ifstream is(path, std::ios::in | std::ios::binary); is.seekg(0, std::ios::end); -- cgit v1.2.3