git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- fix: close source/dst after pvr playback
[enigma2.git]
/
lib
/
dvb
/
dvb.cpp
diff --git
a/lib/dvb/dvb.cpp
b/lib/dvb/dvb.cpp
index d98aa2a81e861245751ef9f8bbea2aac9f1c7094..4f5ecf2e022105156da238d96b76797c5ebb424a 100644
(file)
--- a/
lib/dvb/dvb.cpp
+++ b/
lib/dvb/dvb.cpp
@@
-382,6
+382,8
@@
eDVBChannel::~eDVBChannel()
if (m_pvr_thread)
{
m_pvr_thread->stop();
if (m_pvr_thread)
{
m_pvr_thread->stop();
+ ::close(m_pvr_fd_src);
+ ::close(m_pvr_fd_dst);
delete m_pvr_thread;
}
}
delete m_pvr_thread;
}
}
@@
-520,18
+522,18
@@
RESULT eDVBChannel::playFile(const char *file)
/* (this codepath needs to be improved anyway.) */
/* (this codepath needs to be improved anyway.) */
-
int de
st = open("/dev/misc/pvr", O_WRONLY);
- if (
de
st < 0)
+
m_pvr_fd_d
st = open("/dev/misc/pvr", O_WRONLY);
+ if (
m_pvr_fd_d
st < 0)
{
eDebug("can't open /dev/misc/pvr - you need to buy the new(!) $$$ box! (%m)");
return -ENODEV;
}
{
eDebug("can't open /dev/misc/pvr - you need to buy the new(!) $$$ box! (%m)");
return -ENODEV;
}
-
int source
= open(file, O_RDONLY);
- if (
source
< 0)
+
m_pvr_fd_src
= open(file, O_RDONLY);
+ if (
m_pvr_fd_src
< 0)
{
{
- eDebug("can't open PVR
source
file %s (%m)", file);
- close(
de
st);
+ eDebug("can't open PVR
m_pvr_fd_src
file %s (%m)", file);
+ close(
m_pvr_fd_d
st);
return -ENOENT;
}
return -ENOENT;
}
@@
-539,5
+541,5
@@
RESULT eDVBChannel::playFile(const char *file)
m_stateChanged(this);
m_pvr_thread = new eFilePushThread();
m_stateChanged(this);
m_pvr_thread = new eFilePushThread();
- m_pvr_thread->start(
source, de
st);
+ m_pvr_thread->start(
m_pvr_fd_src, m_pvr_fd_d
st);
}
}