fix return codes in streaming

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

diff --git a/lib/service/servicedvbrecord.cpp b/lib/service/servicedvbrecord.cpp
index 62f3a1262c3323cd73bda1e044984e5fe6e42b9b..86461d051d2e64cb3c95d1781e1a96038e872daa 100644 (file)
--- a/lib/service/servicedvbrecord.cpp
+++ b/lib/service/servicedvbrecord.cpp
@@ -45,6 +45,14 @@ void eDVBServiceRecord::serviceEvent(int event)
                m_event((iRecordableService*)this, evNewProgramInfo);
                break;
        }
+       case eDVBServicePMTHandler::eventMisconfiguration:
+               m_error = errMisconfiguration;
+               m_event((iRecordableService*)this, evTuneFailed);
+               break;
+       case eDVBServicePMTHandler::eventNoResources:
+               m_error = errNoResources;
+               m_event((iRecordableService*)this, evTuneFailed);
+               break;
        }
 }
 
@@ -111,6 +119,7 @@ RESULT eDVBServiceRecord::prepareStreaming()
        m_streaming = 1;
        if (m_state == stateIdle)
                return doPrepare();
+       return -1;
 }
 
 RESULT eDVBServiceRecord::start()
@@ -124,8 +133,7 @@ RESULT eDVBServiceRecord::start()
 
 RESULT eDVBServiceRecord::stop()
 {
-       eDebug("stop recording!!");
-       m_event((iRecordableService*)this, evStop);
+       eDebug("stop recording!");
        if (m_state == stateRecording)
        {
                if (m_record)
@@ -136,8 +144,8 @@ RESULT eDVBServiceRecord::stop()
                        m_target_fd = -1;
                }
                m_state = statePrepared;
-       }
-       
+       } else
+               eDebug("(was not recording)");
        if (m_state == statePrepared)
        {
                m_record = 0;
@@ -207,6 +215,8 @@ int eDVBServiceRecord::doRecord()
                }
                m_record->setTargetFD(fd);
                m_record->setTargetFilename(m_filename.c_str());
+               m_record->connectEvent(slot(*this, &eDVBServiceRecord::recordEvent), m_con_record_event);
+
                m_target_fd = fd;
        }
        
@@ -346,14 +356,6 @@ RESULT eDVBServiceRecord::connectEvent(const Slot2<void,iRecordableService*,int>
        return 0;
 }
 
-static PyObject *createTuple(int pid, const char *type)
-{
-       PyObject *r = PyTuple_New(2);
-       PyTuple_SetItem(r, 0, PyInt_FromLong(pid));
-       PyTuple_SetItem(r, 1, PyString_FromString(type));
-       return r;
-}
-
 RESULT eDVBServiceRecord::stream(ePtr<iStreamableService> &ptr)
 {
        ptr = this;
@@ -382,3 +384,16 @@ PyObject *eDVBServiceRecord::getStreamingData()
        return r;
 }
 
+void eDVBServiceRecord::recordEvent(int event)
+{
+       switch (event)
+       {
+       case iDVBTSRecorder::eventWriteError:
+               eWarning("[eDVBServiceRecord] record write error");
+               stop();
+               m_event((iRecordableService*)this, evRecordWriteError);
+               return;
+       default:
+               eDebug("unhandled record event %d", event);
+       }
+}