mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-03 02:41:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'check/cst-next'

Browse Source 
Conflicts:
	src/gui/epgview.cpp
This commit is contained in:
Stefan Seyfried
2015-02-07 23:12:01 +01:00
parent 48d3e45eb7 d58f621769
commit 66adad0811
26 changed files with 251 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/driver/pictureviewer/pictureviewer.cpp
View File

@@ -111,15 +111,23 @@ std::string CPictureViewer::DownloadImage(std::string url)
FILE *tmpFile = fopen(tmpname.c_str(), "wb");
if (tmpFile) {
CURL *ch = curl_easy_init();
curl_easy_setopt(ch, CURLOPT_VERBOSE, 0L);
curl_easy_setopt(ch, CURLOPT_NOPROGRESS, 1L);
curl_easy_setopt(ch, CURLOPT_NOSIGNAL, 1L);
curl_easy_setopt(ch, CURLOPT_WRITEFUNCTION, NULL);
curl_easy_setopt(ch, CURLOPT_WRITEDATA, tmpFile);
curl_easy_setopt(ch, CURLOPT_FAILONERROR, 1L);
curl_easy_setopt(ch, CURLOPT_URL, url.c_str());
curl_easy_perform(ch);
curl_easy_cleanup(ch);
if(ch)
{
curl_easy_setopt(ch, CURLOPT_VERBOSE, 0L);
curl_easy_setopt(ch, CURLOPT_NOPROGRESS, 1L);
curl_easy_setopt(ch, CURLOPT_NOSIGNAL, 1L);
curl_easy_setopt(ch, CURLOPT_WRITEFUNCTION, NULL);
curl_easy_setopt(ch, CURLOPT_WRITEDATA, tmpFile);
curl_easy_setopt(ch, CURLOPT_FAILONERROR, 1L);
curl_easy_setopt(ch, CURLOPT_URL, url.c_str());
curl_easy_setopt(ch, CURLOPT_CONNECTTIMEOUT, 3);
curl_easy_setopt(ch, CURLOPT_TIMEOUT, 4);
CURLcode res = curl_easy_perform(ch);
if (res != CURLE_OK){
printf("[%s] curl_easy_perform() failed:%s\n",__func__, curl_easy_strerror(res));
}
curl_easy_cleanup(ch);
}
fclose(tmpFile);
url = true;
}

5
src/driver/record.cpp
View File

@@ -580,8 +580,13 @@ void CRecordInstance::FillMovieInfo(CZapitChannel * channel, APIDList & apid_lis
info2 = epgdata.info2;
recMovieInfo->parentalLockAge = epgdata.fsk;
#ifdef FULL_CONTENT_CLASSIFICATION
if( !epgdata.contentClassification.empty() )
recMovieInfo->genreMajor = epgdata.contentClassification[0];
#else
if(epgdata.contentClassification)
recMovieInfo->genreMajor = epgdata.contentClassification;
#endif
recMovieInfo->length = epgdata.epg_times.dauer / 60;