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

Get rid of boost posix_time

Browse Source
This commit is contained in:
emeric
2018-04-16 21:01:42 +02:00
parent 9cb4918f44
commit 7721f6e874
7 changed files with 17 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/MediaPlayer.cpp
+1 -1
View File
@@ -56,7 +56,7 @@ MediaPlayer::playTrack(Database::Track::id_type trackId)
{
Av::MediaFile mediaFile(track->getPath());
auto resource = LmsApp->getTranscodeResource()->getUrl(trackId, Av::Encoding::MP3, boost::posix_time::seconds(0));
auto resource = LmsApp->getTranscodeResource()->getUrl(trackId, Av::Encoding::MP3);
auto imgResource = LmsApp->getImageResource()->getTrackUrl(trackId, 64);
std::ostringstream oss;
src/ui/resource/TranscodeResource.cpp
+5 -6
View File
@@ -40,10 +40,9 @@ TranscodeResource:: ~TranscodeResource()
}
std::string
TranscodeResource::getUrl(Database::Track::id_type trackId, Av::Encoding encoding, boost::posix_time::time_duration offset) const
TranscodeResource::getUrl(Database::Track::id_type trackId, Av::Encoding encoding) const
{
std::string res = url()+ "&trackid=" + std::to_string(trackId) + "&encoding=" + std::to_string(Av::encoding_to_int(encoding));
res += "&offset=" + std::to_string(offset.seconds());
std::string res = url()+ "&trackid=" + std::to_string(trackId) + "&encoding=" + std::to_string(Av::encodingToInt(encoding));
return res;
}
@@ -81,11 +80,11 @@ TranscodeResource::handleRequest(const Wt::Http::Request& request,
auto offsetStr = request.getParameter("offset");
if (offsetStr)
parameters.offset = boost::posix_time::seconds(std::stol(*offsetStr));
parameters.offset = std::chrono::seconds(std::stol(*offsetStr));
auto encodingStr = request.getParameter("encoding");
if (encodingStr)
parameters.encoding = Av::encoding_from_int(std::stol(*encodingStr));
parameters.encoding = Av::encodingFromInt(std::stol(*encodingStr));
auto streamStr = request.getParameter("stream");
if (streamStr)
@@ -116,7 +115,7 @@ TranscodeResource::handleRequest(const Wt::Http::Request& request,
transcoder = std::make_shared<Av::Transcoder>(track->getPath(), parameters);
}
std::string mimeType = Av::encoding_to_mimetype(transcoder->getParameters().encoding);
std::string mimeType = Av::encodingToMimetype(transcoder->getParameters().encoding);
LMS_LOG(UI, DEBUG) << "Mime type set to '" << mimeType << "'";
response.setMimeType(mimeType);
src/ui/resource/TranscodeResource.hpp
+1 -1
View File
@@ -35,7 +35,7 @@ class TranscodeResource : public Wt::WResource
TranscodeResource(Database::Handler& db);
~TranscodeResource();
std::string getUrl(Database::Track::id_type trackId, Av::Encoding encoding, boost::posix_time::time_duration offset) const;
std::string getUrl(Database::Track::id_type trackId, Av::Encoding encoding) const;
void handleRequest(const Wt::Http::Request& request,
Wt::Http::Response& response);