projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'dm/experimental' into test_0413
[vuplus_dvbapp]
/
lib
/
dvb
/
frontend.cpp
diff --git
a/lib/dvb/frontend.cpp
b/lib/dvb/frontend.cpp
old mode 100644
(file)
new mode 100755
(executable)
index
5718896
..
7777bf6
--- a/
lib/dvb/frontend.cpp
+++ b/
lib/dvb/frontend.cpp
@@
-490,6
+490,11
@@
void eDVBFrontend::reopenFrontend()
openFrontend();
}
openFrontend();
}
+#ifdef BUILD_VUPLUS /* ikseong */
+int frontend0_fd;
+int frontend1_fd;
+#endif
+
int eDVBFrontend::openFrontend()
{
if (m_state != stateClosed)
int eDVBFrontend::openFrontend()
{
if (m_state != stateClosed)
@@
-514,6
+519,15
@@
int eDVBFrontend::openFrontend()
eWarning("failed! (%s) %m", m_filename);
return -1;
}
eWarning("failed! (%s) %m", m_filename);
return -1;
}
+#ifdef BUILD_VUPLUS /* ikseong */
+ else
+ {
+ if (m_dvbid==0)
+ frontend0_fd = m_fd;
+ else if (m_dvbid==1)
+ frontend1_fd = m_fd;
+ }
+#endif
}
else
eWarning("frontend %d already opened", m_dvbid);
}
else
eWarning("frontend %d already opened", m_dvbid);
@@
-738,6
+752,10
@@
void eDVBFrontend::timeout()
m_tuning = 0;
if (m_state == stateTuning)
{
m_tuning = 0;
if (m_state == stateTuning)
{
+#ifdef BUILD_VUPLUS /* ikseong */
+ eDVBFrontend *sec_fe = this;
+ sec_fe->m_data[CSW] = sec_fe->m_data[UCSW] = sec_fe->m_data[TONEBURST] = -1; // reset diseqc
+#endif
m_state = stateFailed;
m_stateChanged(this);
}
m_state = stateFailed;
m_stateChanged(this);
}