mirror of
https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git
synced 2023-10-10 19:16:51 +02:00
Fixed priority handling, messed up when adding multi-device support
This commit is contained in:
parent
8c5859ed4a
commit
a9c2adb565
1
HISTORY
1
HISTORY
@ -1,6 +1,7 @@
|
||||
VDR Plugin 'streamdev' Revision History
|
||||
---------------------------------------
|
||||
|
||||
- Fixed priority handling, messed up when adding multi-device support
|
||||
- Added HTTP "Server" header (suggested by hivdr)
|
||||
- Ignore dummy file extensions (.ts, .vob, .vdr) when parsing HTTP URIs
|
||||
- Select start position for replaying a recording by parameter pos=. Supported
|
||||
|
@ -101,7 +101,7 @@ bool cStreamdevDevice::ProvidesChannel(const cChannel *Channel, int Priority,
|
||||
if (m_Disabled || Channel == m_DenyChannel)
|
||||
return false;
|
||||
|
||||
Dprintf("ProvidesChannel, Channel=%s, Prio=%d\n", Channel->Name(), Priority);
|
||||
Dprintf("ProvidesChannel, Channel=%s, Priority=%d, SocketPrio=%d\n", Channel->Name(), Priority, m_ClientSocket->Priority());
|
||||
|
||||
if (StreamdevClientSetup.MinPriority <= StreamdevClientSetup.MaxPriority)
|
||||
{
|
||||
@ -296,8 +296,8 @@ void cStreamdevDevice::UpdatePriority(bool SwitchingChannels) const {
|
||||
if (m_ClientSocket->SupportsPrio() && m_ClientSocket->DataSocket(siLive)) {
|
||||
int Priority = this->Priority();
|
||||
// override TRANSFERPRIORITY (-1) with live TV priority from setup
|
||||
if (this == cDevice::ActualDevice() && m_ClientSocket->Priority() == TRANSFERPRIORITY) {
|
||||
int Priority = StreamdevClientSetup.LivePriority;
|
||||
if (Priority == TRANSFERPRIORITY && this == cDevice::ActualDevice()) {
|
||||
Priority = StreamdevClientSetup.LivePriority;
|
||||
// temporarily lower priority
|
||||
if (SwitchingChannels)
|
||||
Priority--;
|
||||
|
Loading…
Reference in New Issue
Block a user