Merge branch 'master' into tmbinc/FixTimingBugs

[enigma2.git] / lib / service / servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index a873576d2500ff34c5d9a253ffca63fbb4047ef0..7e6c0337b5f5b046e605614c038fe6ea8459dc12 100644 (file)
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -31,8 +31,6 @@
 #error no byte order defined!
 #endif
 
 #error no byte order defined!
 #endif
 

-#define TSPATH "/media/hdd"
-

 class eStaticServiceDVBInformation: public iStaticServiceInformation
 {
        DECLARE_REF(eStaticServiceDVBInformation);
 class eStaticServiceDVBInformation: public iStaticServiceInformation
 {
        DECLARE_REF(eStaticServiceDVBInformation);


@@ -174,17 +172,14 @@ void PutSatelliteDataToDict(ePyObject &dict, eDVBFrontendParametersSatellite &fe
                                case eDVBFrontendParametersSatellite::RollOff::alpha_0_20: tmp="0.20"; break;
                        }
                        PutToDict(dict, "roll off", tmp);
                                case eDVBFrontendParametersSatellite::RollOff::alpha_0_20: tmp="0.20"; break;
                        }
                        PutToDict(dict, "roll off", tmp);

-                       if (feparm.modulation == eDVBFrontendParametersSatellite::Modulation::M8PSK)
+                       switch(feparm.pilot)

                        {
                        {

-                               switch(feparm.pilot)
-                               {
-                                       case eDVBFrontendParametersSatellite::Pilot::On: tmp="ON"; break;
-                                       case eDVBFrontendParametersSatellite::Pilot::Off: tmp="OFF"; break;
-                                       default:
-                                       case eDVBFrontendParametersSatellite::Pilot::Unknown: tmp="AUTO"; break;
-                               }
-                               PutToDict(dict, "pilot", tmp);
+                               case eDVBFrontendParametersSatellite::Pilot::On: tmp="ON"; break;
+                               case eDVBFrontendParametersSatellite::Pilot::Off: tmp="OFF"; break;
+                               default:
+                               case eDVBFrontendParametersSatellite::Pilot::Unknown: tmp="AUTO"; break;

                        }
                        }

+                       PutToDict(dict, "pilot", tmp);

                        tmp="DVB-S2";
                        break;
        }
                        tmp="DVB-S2";
                        break;
        }


@@ -412,7 +407,7 @@ RESULT eStaticServiceDVBBouquetInformation::getName(const eServiceReference &ref
                return -1;
 }
 
                return -1;
 }
 

-int eStaticServiceDVBBouquetInformation::isPlayable(const eServiceReference &ref, const eServiceReference &ignore)
+int eStaticServiceDVBBouquetInformation::isPlayable(const eServiceReference &ref, const eServiceReference &ignore, bool simulate)

 {
        if (ref.flags & eServiceReference::isGroup)
        {
 {
        if (ref.flags & eServiceReference::isGroup)
        {


@@ -453,7 +448,7 @@ int eStaticServiceDVBBouquetInformation::isPlayable(const eServiceReference &ref
                                { 2, 1, 3 }  // -T -S -C
                        };
                        ((const eServiceReferenceDVB&)*it).getChannelID(chid);
                                { 2, 1, 3 }  // -T -S -C
                        };
                        ((const eServiceReferenceDVB&)*it).getChannelID(chid);

-                       int tmp=res->canAllocateChannel(chid, chid_ignore);
+                       int tmp=res->canAllocateChannel(chid, chid_ignore, simulate);

                        switch(tmp)
                        {
                                case 0:
                        switch(tmp)
                        {
                                case 0:


@@ -1501,9 +1496,16 @@ RESULT eDVBServicePlay::timeshift(ePtr<iTimeshiftService> &ptr)
        {
                if (!m_timeshift_enabled)
                {
        {
                if (!m_timeshift_enabled)
                {

-                               /* we need enough diskspace */
+                       /* query config path */
+                       std::string tspath;
+                       if(ePythonConfigQuery::getConfigValue("config.usage.timeshift_path", tspath) == -1){
+                               eDebug("could not query ts path from config");
+                               return -4;
+                       }
+                       tspath.append("/");
+                       /* we need enough diskspace */

                        struct statfs fs;
                        struct statfs fs;

-                       if (statfs(TSPATH "/.", &fs) < 0)
+                       if (statfs(tspath.c_str(), &fs) < 0)

                        {
                                eDebug("statfs failed!");
                                return -2;
                        {
                                eDebug("statfs failed!");
                                return -2;


@@ -2121,12 +2123,23 @@ RESULT eDVBServicePlay::startTimeshift()
        if (!m_record)
                return -3;
 
        if (!m_record)
                return -3;
 

-       char templ[]=TSPATH "/timeshift.XXXXXX";
+       std::string tspath;
+       if(ePythonConfigQuery::getConfigValue("config.usage.timeshift_path", tspath) == -1){ 
+               eDebug("could not query ts path");
+               return -5;
+       }
+       tspath.append("/timeshift.XXXXXX");
+       char* templ;
+       templ = new char[tspath.length() + 1];
+       strcpy(templ, tspath.c_str());
+

        m_timeshift_fd = mkstemp(templ);
        m_timeshift_fd = mkstemp(templ);

-       m_timeshift_file = templ;
-       
+       m_timeshift_file = std::string(templ);
+

        eDebug("recording to %s", templ);
        eDebug("recording to %s", templ);

-       
+
+       delete [] templ;
+

        if (m_timeshift_fd < 0)
        {
                m_record = 0;
        if (m_timeshift_fd < 0)
        {
                m_record = 0;