git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
plugins are now able to add device specific text to /etc/networking/interfaces
[enigma2.git]
/
lib
/
dvb
/
dvb.cpp
diff --git
a/lib/dvb/dvb.cpp
b/lib/dvb/dvb.cpp
index 135d0547a7dcb51f45cf74476ccad4a4ef6928fb..ad146542412c6e76ada44de6f5fdbec7f7609034 100644
(file)
--- a/
lib/dvb/dvb.cpp
+++ b/
lib/dvb/dvb.cpp
@@
-52,6
+52,13
@@
RESULT eDVBResourceManager::getInstance(ePtr<eDVBResourceManager> &ptr)
return -1;
}
return -1;
}
+ePtr<eDVBResourceManager> NewResourceManagerPtr(void)
+{
+ ePtr<eDVBResourceManager> ptr;
+ eDVBResourceManager::getInstance(ptr);
+ return ptr;
+}
+
eDVBResourceManager::eDVBResourceManager()
:m_releaseCachedChannelTimer(eApp)
{
eDVBResourceManager::eDVBResourceManager()
:m_releaseCachedChannelTimer(eApp)
{
@@
-529,7
+536,7
@@
int eDVBResourceManager::canAllocateFrontend(ePtr<iDVBFrontendParameters> &fepar
int eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID& ignore)
{
int eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID& ignore)
{
-
bool ret=3
000;
+
int ret=30
000;
if (m_cached_channel)
{
eDVBChannel *cache_chan = (eDVBChannel*)&(*m_cached_channel);
if (m_cached_channel)
{
eDVBChannel *cache_chan = (eDVBChannel*)&(*m_cached_channel);
@@
-1203,7
+1210,7
@@
eCueSheet::eCueSheet()
void eCueSheet::seekTo(int relative, const pts_t &pts)
{
{
void eCueSheet::seekTo(int relative, const pts_t &pts)
{
{
- eSingleLock l(m_lock);
+ eSingleLock
er
l(m_lock);
m_seek_requests.push_back(std::pair<int, pts_t>(relative, pts));
}
m_event(evtSeek);
m_seek_requests.push_back(std::pair<int, pts_t>(relative, pts));
}
m_event(evtSeek);
@@
-1211,14
+1218,14
@@
void eCueSheet::seekTo(int relative, const pts_t &pts)
void eCueSheet::clear()
{
void eCueSheet::clear()
{
- eSingleLock l(m_lock);
+ eSingleLock
er
l(m_lock);
m_spans.clear();
}
void eCueSheet::addSourceSpan(const pts_t &begin, const pts_t &end)
{
{
m_spans.clear();
}
void eCueSheet::addSourceSpan(const pts_t &begin, const pts_t &end)
{
{
- eSingleLock l(m_lock);
+ eSingleLock
er
l(m_lock);
m_spans.push_back(std::pair<pts_t, pts_t>(begin, end));
}
}
m_spans.push_back(std::pair<pts_t, pts_t>(begin, end));
}
}
@@
-1231,7
+1238,7
@@
void eCueSheet::commitSpans()
void eCueSheet::setSkipmode(const pts_t &ratio)
{
{
void eCueSheet::setSkipmode(const pts_t &ratio)
{
{
- eSingleLock l(m_lock);
+ eSingleLock
er
l(m_lock);
m_skipmode_ratio = ratio;
}
m_event(evtSkipmode);
m_skipmode_ratio = ratio;
}
m_event(evtSkipmode);