projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'obi/master-20110329' into experimental
[vuplus_dvbapp]
/
lib
/
dvb
/
dvb.cpp
diff --git
a/lib/dvb/dvb.cpp
b/lib/dvb/dvb.cpp
index
6f9a67f
..
0b1bdc2
100644
(file)
--- a/
lib/dvb/dvb.cpp
+++ b/
lib/dvb/dvb.cpp
@@
-145,19
+145,20
@@
eDVBAdapterLinux::eDVBAdapterLinux(int nr): m_nr(nr)
#endif
if (stat(filename, &s))
break;
#endif
if (stat(filename, &s))
break;
- e
Ptr<eDVBFrontend>
fe;
+ e
DVBFrontend *
fe;
{
int ok = 0;
{
int ok = 0;
- fe = new eDVBFrontend(m_nr, num_fe, ok);
+ fe = new eDVBFrontend(m_nr, num_fe, ok
, true
);
if (ok)
if (ok)
- m_
frontend.push_back(fe
);
+ m_
simulate_frontend.push_back(ePtr<eDVBFrontend>(fe)
);
}
}
+
{
int ok = 0;
{
int ok = 0;
- fe = new eDVBFrontend(m_nr, num_fe, ok,
tru
e);
+ fe = new eDVBFrontend(m_nr, num_fe, ok,
false, f
e);
if (ok)
if (ok)
- m_
simulate_frontend.push_back(fe
);
+ m_
frontend.push_back(ePtr<eDVBFrontend>(fe)
);
}
++num_fe;
}
}
++num_fe;
}