Dropped m_UpdatePriority

This commit is contained in:
Frank Schmirler 2012-05-27 01:31:45 +02:00
parent fffd5aef4f
commit 16f8c75918
2 changed files with 1 additions and 6 deletions

View File

@ -158,8 +158,6 @@ bool cStreamdevDevice::SetChannelDevice(const cChannel *Channel,
LiveView ? "true" : "false"); LiveView ? "true" : "false");
LOCK_THREAD; LOCK_THREAD;
m_UpdatePriority = ClientSocket.SupportsPrio();
if (LiveView) if (LiveView)
return false; return false;
@ -180,8 +178,6 @@ bool cStreamdevDevice::SetPid(cPidHandle *Handle, int Type, bool On) {
Dprintf("SetPid, Pid=%d, Type=%d, On=%d, used=%d\n", Handle->pid, Type, On, Handle->used); Dprintf("SetPid, Pid=%d, Type=%d, On=%d, used=%d\n", Handle->pid, Type, On, Handle->used);
LOCK_THREAD; LOCK_THREAD;
m_UpdatePriority = ClientSocket.SupportsPrio();
bool res = true; bool res = true;
if (Handle->pid && (On || !Handle->used)) { if (Handle->pid && (On || !Handle->used)) {
res = ClientSocket.SetPid(Handle->pid, On); res = ClientSocket.SetPid(Handle->pid, On);
@ -298,7 +294,7 @@ bool cStreamdevDevice::ReInit(void) {
void cStreamdevDevice::UpdatePriority(bool SwitchingChannels) { void cStreamdevDevice::UpdatePriority(bool SwitchingChannels) {
if (m_Device) { if (m_Device) {
m_Device->Lock(); m_Device->Lock();
if (m_Device->m_UpdatePriority && ClientSocket.DataSocket(siLive)) { if (ClientSocket.SupportsPrio() && ClientSocket.DataSocket(siLive)) {
int Priority = m_Device->Priority(); int Priority = m_Device->Priority();
// override TRANSFERPRIORITY (-1) with live TV priority from setup // override TRANSFERPRIORITY (-1) with live TV priority from setup
if (m_Device == cDevice::ActualDevice() && Priority == TRANSFERPRIORITY) { if (m_Device == cDevice::ActualDevice() && Priority == TRANSFERPRIORITY) {

View File

@ -22,7 +22,6 @@ private:
cStreamdevFilters *m_Filters; cStreamdevFilters *m_Filters;
int m_Pids; int m_Pids;
int m_Priority; int m_Priority;
bool m_UpdatePriority;
static cStreamdevDevice *m_Device; static cStreamdevDevice *m_Device;
static const cChannel *m_DenyChannel; static const cChannel *m_DenyChannel;