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 service to be overridden for pvr services
[enigma2.git]
/
lib
/
dvb
/
demux.cpp
diff --git
a/lib/dvb/demux.cpp
b/lib/dvb/demux.cpp
index 810b10a5983604b65f6c4940546666ba43d34d0f..918ecec6bf6dca4c0a1b9ef33541e7ff97d437eb 100644
(file)
--- a/
lib/dvb/demux.cpp
+++ b/
lib/dvb/demux.cpp
@@
-402,9
+402,10
@@
class eDVBRecordFileThread: public eFilePushThread
{
public:
eDVBRecordFileThread();
{
public:
eDVBRecordFileThread();
- void setTimingPID(int pid);
+ void setTimingPID(int pid
, int type
);
- void saveTimingInformation(const std::string &filename);
+ void startSaveMetaInformation(const std::string &filename);
+ void stopSaveMetaInformation();
int getLastPTS(pts_t &pts);
protected:
int filterRecordData(const unsigned char *data, int len, size_t ¤t_span_remaining);
int getLastPTS(pts_t &pts);
protected:
int filterRecordData(const unsigned char *data, int len, size_t ¤t_span_remaining);
@@
-422,14
+423,19
@@
eDVBRecordFileThread::eDVBRecordFileThread()
m_current_offset = 0;
}
m_current_offset = 0;
}
-void eDVBRecordFileThread::setTimingPID(int pid)
+void eDVBRecordFileThread::setTimingPID(int pid
, int type
)
{
{
- m_ts_parser.setPid(pid);
+ m_ts_parser.setPid(pid
, type
);
}
}
-void eDVBRecordFileThread::s
aveTiming
Information(const std::string &filename)
+void eDVBRecordFileThread::s
tartSaveMeta
Information(const std::string &filename)
{
{
- m_stream_info.save(filename.c_str());
+ m_stream_info.startSave(filename.c_str());
+}
+
+void eDVBRecordFileThread::stopSaveMetaInformation()
+{
+ m_stream_info.stopSave();
}
int eDVBRecordFileThread::getLastPTS(pts_t &pts)
}
int eDVBRecordFileThread::getLastPTS(pts_t &pts)
@@
-520,6
+526,9
@@
RESULT eDVBTSRecorder::start()
::ioctl(m_source_fd, DMX_START);
#endif
::ioctl(m_source_fd, DMX_START);
#endif
+
+ if (m_target_filename != "")
+ m_thread->startSaveMetaInformation(m_target_filename);
m_thread->start(m_source_fd, m_target_fd);
m_running = 1;
m_thread->start(m_source_fd, m_target_fd);
m_running = 1;
@@
-553,11
+562,11
@@
RESULT eDVBTSRecorder::removePID(int pid)
return 0;
}
return 0;
}
-RESULT eDVBTSRecorder::setTimingPID(int pid)
+RESULT eDVBTSRecorder::setTimingPID(int pid
, int type
)
{
if (m_running)
return -1;
{
if (m_running)
return -1;
- m_thread->setTimingPID(pid);
+ m_thread->setTimingPID(pid
, type
);
return 0;
}
return 0;
}
@@
-590,8
+599,7
@@
RESULT eDVBTSRecorder::stop()
close(m_source_fd);
m_source_fd = -1;
close(m_source_fd);
m_source_fd = -1;
- if (m_target_filename != "")
- m_thread->saveTimingInformation(m_target_filename + ".ap");
+ m_thread->stopSaveMetaInformation();
return 0;
}
return 0;
}