mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-08-23 13:10:49 +02:00
parent 8c45b2eea6 350a73ce08
commit 6be63f736c
15 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nhttpd/tuxboxapi/neutrinoapi.cpp
View File

@@ -466,7 +466,7 @@ int CNeutrinoAPI::setVideoAspectRatioAsString(std::string newRatioString)
//-------------------------------------------------------------------------
std::string CNeutrinoAPI::getVideoResolutionAsString(void)
{
int xres, yres, framerate;
int xres = 0, yres = 0, framerate = 0;
videoDecoder->getPictureInfo(xres, yres, framerate);
std::stringstream out;
out << xres << "x" << yres;
@@ -476,7 +476,7 @@ std::string CNeutrinoAPI::getVideoResolutionAsString(void)
//-------------------------------------------------------------------------
std::string CNeutrinoAPI::getVideoFramerateAsString(void)
{
int xres, yres, framerate;
int xres = 0, yres = 0, framerate = 0;
std::string sframerate = "{=L:unknown=}";
videoDecoder->getPictureInfo(xres, yres, framerate);
switch(framerate){
@@ -491,7 +491,7 @@ std::string CNeutrinoAPI::getVideoFramerateAsString(void)
//-------------------------------------------------------------------------
std::string CNeutrinoAPI::getAudioInfoAsString(void)
{
int type, layer, freq, mode, lbitrate;
int type = 0, layer = 0, freq = 0, mode = 0, lbitrate = 0;
audioDecoder->getAudioInfo(type, layer, freq, lbitrate, mode);
std::stringstream out;
if(type == 0)
@@ -557,7 +557,7 @@ void CNeutrinoAPI::SendAllTimers(std::string url, bool force)
Timerd->getTimerList(timerlist);
sort(timerlist.begin(), timerlist.end());
int pre,post;
int pre = 0,post = 0;
Timerd->getRecordingSafety(pre,post);
CHTTPTool httpTool;
std::string r_url;

4
src/nhttpd/tuxboxapi/neutrinoyparser.cpp
View File

@@ -1023,6 +1023,10 @@ std::string CNeutrinoYParser::func_set_timer_form(CyhookHandler *hh, std::strin
unsigned timerId=0;
std::string cmd, stimerid;
CTimerd::responseGetTimer timer; // Timer
timer.alarmTime = 0;
timer.stopTime = 0;
timer.apids = 0;
timer.eventType = CTimerd::__TIMER_NEXTPROGRAM;//nothing
time_t now_t = time(NULL);
ySplitString(para, " ", cmd, stimerid);
if(cmd != "new")