git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow setting a menu entry name for network setup plugins
[enigma2.git]
/
lib
/
service
/
servicedvbrecord.cpp
diff --git
a/lib/service/servicedvbrecord.cpp
b/lib/service/servicedvbrecord.cpp
index 62f3a1262c3323cd73bda1e044984e5fe6e42b9b..8feb8156b206c1054b35c72243f0a8e3d2425a0b 100644
(file)
--- a/
lib/service/servicedvbrecord.cpp
+++ b/
lib/service/servicedvbrecord.cpp
@@
-111,6
+111,7
@@
RESULT eDVBServiceRecord::prepareStreaming()
m_streaming = 1;
if (m_state == stateIdle)
return doPrepare();
m_streaming = 1;
if (m_state == stateIdle)
return doPrepare();
+ return -1;
}
RESULT eDVBServiceRecord::start()
}
RESULT eDVBServiceRecord::start()
@@
-125,7
+126,6
@@
RESULT eDVBServiceRecord::start()
RESULT eDVBServiceRecord::stop()
{
eDebug("stop recording!!");
RESULT eDVBServiceRecord::stop()
{
eDebug("stop recording!!");
- m_event((iRecordableService*)this, evStop);
if (m_state == stateRecording)
{
if (m_record)
if (m_state == stateRecording)
{
if (m_record)
@@
-137,7
+137,6
@@
RESULT eDVBServiceRecord::stop()
}
m_state = statePrepared;
}
}
m_state = statePrepared;
}
-
if (m_state == statePrepared)
{
m_record = 0;
if (m_state == statePrepared)
{
m_record = 0;
@@
-346,14
+345,6
@@
RESULT eDVBServiceRecord::connectEvent(const Slot2<void,iRecordableService*,int>
return 0;
}
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;
RESULT eDVBServiceRecord::stream(ePtr<iStreamableService> &ptr)
{
ptr = this;