git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace software update plugin with a more user friendly approach
[enigma2.git]
/
lib
/
dvb
/
dvb.cpp
diff --git
a/lib/dvb/dvb.cpp
b/lib/dvb/dvb.cpp
index c3c0a026980f30705620a0b5175e866c6bcc2b66..ecb0ec6ed1724d70e9969e1af91aba12b0067526 100644
(file)
--- a/
lib/dvb/dvb.cpp
+++ b/
lib/dvb/dvb.cpp
@@
-529,7
+529,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=true
;
+
int ret=30000
;
if (m_cached_channel)
{
eDVBChannel *cache_chan = (eDVBChannel*)&(*m_cached_channel);
if (m_cached_channel)
{
eDVBChannel *cache_chan = (eDVBChannel*)&(*m_cached_channel);
@@
-615,14
+615,14
@@
int eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, cons
if (!m_list)
{
eDebug("no channel list set!");
if (!m_list)
{
eDebug("no channel list set!");
- ret =
false
;
+ ret =
0
;
goto error;
}
if (m_list->getChannelFrontendData(channelid, feparm))
{
eDebug("channel not found!");
goto error;
}
if (m_list->getChannelFrontendData(channelid, feparm))
{
eDebug("channel not found!");
- ret =
false
;
+ ret =
0
;
goto error;
}
goto error;
}
@@
-1203,7
+1203,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
+1211,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
+1231,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);