frodovdr/vdr-plugin-satip
1
0
Fork 0
mirror of https://github.com/rofafor/vdr-plugin-satip.git synced 2023-10-10 13:37:42 +02:00
Code Issues Releases Wiki Activity

Fixed the frontend assignment.

Browse Source
This commit is contained in:
Rolf Ahrenberg 2015-02-16 19:42:18 +02:00
parent 84dfc6701e
commit 6b63ad145f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server.c
View File

@ -31,7 +31,7 @@ cSatipFrontend::~cSatipFrontend()
bool cSatipFrontends::Matches(int deviceIdP, int transponderP) bool cSatipFrontends::Matches(int deviceIdP, int transponderP)
{ {
for (cSatipFrontend *f = First(); f; f = Next(f)) { for (cSatipFrontend *f = First(); f; f = Next(f)) {
if (f->Attached() && (f->Transponder() == transponderP)) if (f->Attached() && (f->DeviceId() == deviceIdP) && (f->Transponder() == transponderP))
return true; return true;
} }
return false; return false;
@ -39,10 +39,10 @@ bool cSatipFrontends::Matches(int deviceIdP, int transponderP)
bool cSatipFrontends::Assign(int deviceIdP, int transponderP) bool cSatipFrontends::Assign(int deviceIdP, int transponderP)
{ {
cSatipFrontend *tmp = First(); cSatipFrontend *tmp = NULL;
// Prefer any unused one // Prefer any unused one
for (cSatipFrontend *f = First(); f; f = Next(f)) { for (cSatipFrontend *f = First(); f; f = Next(f)) {
if (!f->Attached()) { if (!f->Attached() || (f->DeviceId() == deviceIdP)) {
tmp = f; tmp = f;
break; break;
} }

1
server.h
View File

@ -28,6 +28,7 @@ public:
bool Attached(void) { return (deviceIdM >= 0); } bool Attached(void) { return (deviceIdM >= 0); }
int Index(void) { return indexM; } int Index(void) { return indexM; }
int Transponder(void) { return transponderM; } int Transponder(void) { return transponderM; }
int DeviceId(void) { return deviceIdM; }
void SetTransponder(int transponderP) { transponderM = transponderP; } void SetTransponder(int transponderP) { transponderM = transponderP; }
}; };