mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 00:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 470a8b62dd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-23 (Wed, 23 Aug 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-08-23 15:24:38 +02:00
parent 90a51a4564 6b015862c1
commit 79c24b3173
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

@@ -467,7 +467,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;
@@ -477,7 +477,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){
@@ -492,7 +492,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)
@@ -558,7 +558,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

@@ -1035,6 +1035,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")