owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[UI] Restored audio encoding setting

Browse Source
This commit is contained in:
emeric
2016-01-16 19:04:46 +01:00
parent 027e9d9bf7
commit 5151d779ae
5 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/resource/TranscodeResource.cpp
+7 -5
View File
@@ -130,14 +130,17 @@ TranscodeResource::handleRequest(const Wt::Http::Request& request,
transcoder = std::make_shared<Av::Transcoder>(track->getPath(), parameters);
}
LMS_LOG(UI, DEBUG) << "Mime type set to '" << Av::encoding_to_mimetype(Av::Encoding::MP3);
response.setMimeType( Av::encoding_to_mimetype(Av::Encoding::MP3) );
std::string mimeType = Av::encoding_to_mimetype(transcoder->getParameters().getEncoding());
LMS_LOG(UI, DEBUG) << "Mime type set to '" << mimeType << "'";
response.setMimeType(mimeType);
if (!transcoder->start())
{
LMS_LOG(UI, ERROR) << "Cannot start transcoder";
return;
}
LMS_LOG(UI, DEBUG) << "Transcoder started";
}
@@ -146,21 +149,20 @@ TranscodeResource::handleRequest(const Wt::Http::Request& request,
std::vector<unsigned char> data;
data.reserve(_bufferSize);
LMS_LOG(UI, DEBUG) << "Reading data from transcoder";
transcoder->process(data, _bufferSize);
response.out().write(reinterpret_cast<char*>(&data[0]), data.size());
LMS_LOG(UI, DEBUG) << "Written " << data.size() << " bytes! complete = " << std::boolalpha << transcoder->isComplete();
if (!response.out())
{
LMS_LOG(UI, ERROR) << "Write failed!";
}
}
if (!transcoder->isComplete() && response.out()) {
continuation = response.createContinuation();
continuation->setData(transcoder);
LMS_LOG(UI, DEBUG) << "Continuation set to " << continuation;
}
else
LMS_LOG(UI, DEBUG) << "No more data!";