diff -u -r vdr-1.3.42-orig/config.c vdr-1.3.42/config.c --- vdr-1.3.42-orig/config.c 2006-01-13 16:19:37.000000000 +0100 +++ vdr-1.3.42/config.c 2006-02-05 18:00:53.000000000 +0100 @@ -272,6 +272,12 @@ CurrentChannel = -1; CurrentVolume = MAXVOLUME; CurrentDolby = 0; + +//ML + VerboseLNBlog = 0; + for (int i = 0; i < MAXDEVICES; i++) CardUsesLNBnr[i] = i + 1; +//ML-Ende + } cSetup& cSetup::operator= (const cSetup &s) @@ -433,7 +439,23 @@ else if (!strcasecmp(Name, "CurrentVolume")) CurrentVolume = atoi(Value); else if (!strcasecmp(Name, "CurrentDolby")) CurrentDolby = atoi(Value); else - return false; + +//ML + if (!strcasecmp(Name, "VerboseLNBlog")) VerboseLNBlog = atoi(Value); + else { + char tmp[20]; + bool result = false; + for (int i = 1; i <= MAXDEVICES; i++) { + sprintf(tmp, "Card%dusesLNBnr", i); + if (!strcasecmp(Name, tmp)) { + CardUsesLNBnr[i - 1] = atoi(Value); + result = true; + } + } + return result; + } +//ML-Ende + return true; } @@ -500,6 +522,17 @@ Store("CurrentVolume", CurrentVolume); Store("CurrentDolby", CurrentDolby); +//ML + Store("VerboseLNBlog", VerboseLNBlog); + char tmp[20]; + if (cDevice::NumDevices() > 1) { + for (int i = 1; i <= cDevice::NumDevices(); i++) { + sprintf(tmp, "Card%dusesLNBnr", i); + Store(tmp, CardUsesLNBnr[i - 1]); + } + } +//ML-Ende + Sort(); if (cConfig::Save()) { diff -u -r vdr-1.3.42-orig/config.h vdr-1.3.42/config.h --- vdr-1.3.42-orig/config.h 2006-01-29 18:24:53.000000000 +0100 +++ vdr-1.3.42/config.h 2006-02-05 18:00:53.000000000 +0100 @@ -238,6 +238,15 @@ int CurrentChannel; int CurrentVolume; int CurrentDolby; + +//ML + int VerboseLNBlog; + #define MAXDEVICES 16 // Since VDR 1.3.32 we can not #include MAXDEVICES from device.h anymore. + // With this workaround a warning will be shown during compilation if + // MAXDEVICES changes in device.h. + int CardUsesLNBnr[MAXDEVICES]; +//ML-Ende + int __EndData__; cSetup(void); cSetup& operator= (const cSetup &s); diff -u -r vdr-1.3.42-orig/device.c vdr-1.3.42/device.c --- vdr-1.3.42-orig/device.c 2006-02-04 15:58:24.000000000 +0100 +++ vdr-1.3.42/device.c 2006-02-05 18:00:53.000000000 +0100 @@ -19,6 +19,10 @@ #include "status.h" #include "transfer.h" +//ML +#include "diseqc.h" +//ML-Ende + // --- cPesAssembler --------------------------------------------------------- class cPesAssembler { @@ -155,6 +159,12 @@ SetVideoFormat(Setup.VideoFormat); +//ML + LNBstate = -1; + LNBnr = Setup.CardUsesLNBnr[cardIndex]; + LNBsource = NULL; +//ML-Ende + mute = false; volume = Setup.CurrentVolume; @@ -214,6 +224,16 @@ useDevice |= (1 << n); } +//ML +void cDevice::SetLNBnr(void) +{ + for (int i = 0; i < numDevices; i++) { + device[i]->LNBnr = Setup.CardUsesLNBnr[i]; + isyslog("LNB-sharing: setting device %d to use LNB %d", i, device[i]->LNBnr); + } +} +//ML-Ende + int cDevice::NextCardIndex(int n) { if (n > 0) { @@ -278,14 +298,117 @@ return (0 <= Index && Index < numDevices) ? device[Index] : NULL; } +//ML +cDevice *cDevice::GetBadDevice(const cChannel *Channel) +{ + if (Setup.DiSEqC) { + cDiseqc *diseqc; + diseqc = Diseqcs.Get(Channel->Source(), Channel->Frequency(), Channel->Polarization()); + + for (int i = 0; i < numDevices; i++) { + if (this != device[i] && device[i]->GetLNBnr() == LNBnr && device[i]->GetLNBsource() != (int*) diseqc) { + if (Setup.VerboseLNBlog) { + isyslog("LNB %d: Device check for channel %d on device %d. LNB or DiSEq conflict with device %d", LNBnr, Channel->Number(), this->DeviceNumber(), i); + } + return device[i]; + } + } + if (Setup.VerboseLNBlog) { + isyslog("LNB %d: Device check for for channel %d on device %d. OK", LNBnr, Channel->Number(), this->DeviceNumber()); + } + } else { + char requiredState; + if (Channel->Frequency() >= Setup.LnbSLOF) { + requiredState = 1 ; + } else { + requiredState = 0; + } + if (Channel->Polarization() == 'v' || Channel->Polarization() == 'V') requiredState += 2; + + for (int i = 0; i < numDevices; i++) { + if (this != device[i] && device[i]->GetLNBnr() == LNBnr && device[i]->GetLNBconf() != requiredState) { + if (Setup.VerboseLNBlog) { + isyslog("LNB %d: Device check for channel %d, LNBstate %d on device %d, current LNBstate %d. Conflict with device %d, LNBstate %d", LNBnr, Channel->Number(), requiredState, this->DeviceNumber(), LNBstate, i, device[i]->GetLNBconf()); + } + return device[i]; + } + } + if (Setup.VerboseLNBlog) { + isyslog("LNB %d: Device check for channel %d, LNBstate %d on device %d, current LNBstate %d. No other devices affected", LNBnr, Channel->Number(), requiredState, this->DeviceNumber(), LNBstate); + } + } + return NULL; +} + +int cDevice::GetMaxBadPriority(const cChannel *Channel) +{ + bool PrimaryIsBad = false; + int maxBadPriority = -2; + if (Setup.DiSEqC) { + cDiseqc *diseqc; + diseqc = Diseqcs.Get(Channel->Source(), Channel->Frequency(), Channel->Polarization()); + + for (int i = 0; i < numDevices; i++) { + if (this != device[i] && device[i]->GetLNBnr() == LNBnr && device[i]->GetLNBsource() != (int*) diseqc) { + if (device[i]->Receiving() && device[i]->Priority() > maxBadPriority) { + maxBadPriority = device[i]->Priority(); + } + if (device[i]->IsPrimaryDevice()) { + PrimaryIsBad = true; + } + } + } + } else { + char requiredState; + if (Channel->Frequency() >= Setup.LnbSLOF) { + requiredState = 1 ; + } else { + requiredState = 0; + } + if (Channel->Polarization() == 'v' || Channel->Polarization() == 'V') requiredState += 2; + + for (int i = 0; i < numDevices; i++) { + if (this != device[i] && device[i]->GetLNBnr() == LNBnr && device[i]->GetLNBconf() != requiredState) { + if (device[i]->Receiving() && device[i]->Priority() > maxBadPriority) { + maxBadPriority = device[i]->Priority(); + } + if (device[i]->IsPrimaryDevice()) { + PrimaryIsBad = true; + } + } + } + } + if (PrimaryIsBad && maxBadPriority == -2) { + maxBadPriority = -1; + } + if (Setup.VerboseLNBlog) { + isyslog("LNB %d: Request for channel %d on device %d. MaxBadPriority is %d", LNBnr, Channel->Number(), this->DeviceNumber(), maxBadPriority); + } + return maxBadPriority; +} +//ML-Ende + + cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers) { cDevice *d = NULL; - int select = 8, pri; + +//ML + int select = 12, pri, pri2, badPriority; +//ML-Ende for (int i = 0; i < numDevices; i++) { bool ndr; if (device[i]->ProvidesChannel(Channel, Priority, &ndr)) { // this device is basicly able to do the job + +//ML + badPriority = device[i]->GetMaxBadPriority(Channel); + if (badPriority >= Priority || (badPriority == -1 && Priority < Setup.PrimaryLimit)) continue; + if (badPriority == -2) pri2 = 0; // not affected by LNB-sharing + else if (badPriority == -1) pri2 = 2; // primary device would need a channel switch + else pri2 = 4; // a device receiving with lower priority would need to be stopped +//ML-Ende + if (device[i]->Receiving() && !ndr) pri = 0; // receiving and allows additional receivers else if (d && !device[i]->Receiving() && device[i]->ProvidesCa(Channel) < d->ProvidesCa(Channel)) @@ -302,8 +425,12 @@ pri = 6; // receiving with same priority but fewer Ca's else pri = 7; // all others - if (pri <= select) { - select = pri; + +//ML + if (pri + pri2 <= select) { + select = pri + pri2; +//ML-Ende + d = device[i]; if (NeedsDetachReceivers) *NeedsDetachReceivers = ndr; @@ -536,7 +663,12 @@ bool cDevice::ProvidesTransponderExclusively(const cChannel *Channel) const { for (int i = 0; i < numDevices; i++) { - if (device[i] && device[i] != this && device[i]->ProvidesTransponder(Channel)) + +//ML +// if (device[i] && device[i] != this && device[i]->ProvidesTransponder(Channel)) + if (device[i] && device[i] != this && device[i]->ProvidesTransponder(Channel) && device[i]->GetLNBnr() != LNBnr) +//ML-Ende + return false; } return true; @@ -554,6 +686,21 @@ bool cDevice::SwitchChannel(const cChannel *Channel, bool LiveView) { + +//ML + cDevice *tmpDevice; + if (this->GetMaxBadPriority(Channel) >= 0) { + Skins.Message(mtInfo, tr("Channel locked by LNB!")); + return false; + } + while ((tmpDevice = GetBadDevice(Channel)) != NULL) { + if (tmpDevice->IsPrimaryDevice() ) + tmpDevice->SwitchChannelForced(Channel, true); + else + tmpDevice->SwitchChannelForced(Channel, false); + } +//ML-Ende + if (LiveView) isyslog("switching to channel %d", Channel->Number()); for (int i = 3; i--;) { @@ -570,6 +717,27 @@ return false; } +//ML +bool cDevice::SwitchChannelForced(const cChannel *Channel, bool LiveView) +{ + if (LiveView) + isyslog("switching to channel %d", Channel->Number()); + for (int i = 3; i--;) { + switch (SetChannel(Channel, LiveView)) { + case scrOk: return true; + case scrNotAvailable: Skins.Message(mtInfo, tr("Channel not available!")); + return false; + case scrNoTransfer: Skins.Message(mtError, tr("Can't start Transfer Mode!")); + return false; + case scrFailed: break; // loop will retry + } + esyslog("retrying"); + } + return false; +} +//ML-Ende + + bool cDevice::SwitchChannel(int Direction) { bool result = false; @@ -580,7 +748,10 @@ cChannel *channel; while ((channel = Channels.GetByNumber(n, Direction)) != NULL) { // try only channels which are currently available - if (PrimaryDevice()->ProvidesChannel(channel, Setup.PrimaryLimit) || PrimaryDevice()->CanReplay() && GetDevice(channel, 0)) +//ML + if (PrimaryDevice()->GetMaxBadPriority(channel) < 0 && (PrimaryDevice()->ProvidesChannel(channel, Setup.PrimaryLimit) || PrimaryDevice()->CanReplay() && GetDevice(channel, 0))) +//ML-Ende + break; n = channel->Number() + Direction; } @@ -615,12 +786,40 @@ eSetChannelResult Result = scrOk; +//ML + char requiredState; + if (Channel->Frequency() >= Setup.LnbSLOF) { + requiredState = 1; + } else { + requiredState = 0; + } + if (Channel->Polarization() == 'v' || Channel->Polarization() == 'V') requiredState += 2; + if (Setup.VerboseLNBlog) { + isyslog("LNB %d: Switching device %d to channel %d", LNBnr, this->DeviceNumber(), Channel->Number()); + } +//ML-Ende + // If this DVB card can't receive this channel, let's see if we can // use the card that actually can receive it and transfer data from there: if (NeedsTransferMode) { cDevice *CaDevice = GetDevice(Channel, 0, &NeedsDetachReceivers); if (CaDevice && CanReplay()) { + +//ML + if (CaDevice->GetLNBnr() == LNBnr) { + if (LNBstate != requiredState || (Setup.DiSEqC && LNBsource != (int*) Diseqcs.Get(Channel->Source(), Channel->Frequency(), Channel->Polarization())) ) { + if (IsPrimaryDevice()) { + SetChannelDevice(Channel, true); + } else { + SetChannelDevice(Channel, false); + } + LNBstate = requiredState; + LNBsource = (int*) Diseqcs.Get(Channel->Source(), Channel->Frequency(), Channel->Polarization()); + } + } +//ML-Ende + cStatus::MsgChannelSwitch(this, 0); // only report status if we are actually going to switch the channel if (CaDevice->SetChannel(Channel, false) == scrOk) { // calling SetChannel() directly, not SwitchChannel()! if (NeedsDetachReceivers) @@ -641,6 +840,12 @@ sectionHandler->SetStatus(false); sectionHandler->SetChannel(NULL); } + +//ML + LNBstate = requiredState; + LNBsource = (int*) Diseqcs.Get(Channel->Source(), Channel->Frequency(), Channel->Polarization()); +//ML-Ende + // Tell the ciHandler about the channel switch and add all PIDs of this // channel to it, for possible later decryption: if (ciHandler) { diff -u -r vdr-1.3.42-orig/device.h vdr-1.3.42/device.h --- vdr-1.3.42-orig/device.h 2006-02-04 15:22:08.000000000 +0100 +++ vdr-1.3.42/device.h 2006-02-05 18:00:53.000000000 +0100 @@ -133,6 +133,33 @@ ///< given Priority. ///< See ProvidesChannel() for more information on how ///< priorities are handled, and the meaning of NeedsDetachReceivers. + +//ML +private: + char LNBstate; // Current frequency band and polarization of the DVB-tuner +// cDiseqc *LNBsource; // can not #include "diseqc.h". A workaround follows: + int *LNBsource; // [DiSEqC] DiSEqC-Source + int LNBnr; // Number of LNB used +public: + char GetLNBconf(void) { return LNBstate; } + int *GetLNBsource(void) { return LNBsource; } + int GetLNBnr(void) { return LNBnr; } + static void SetLNBnr(void); + cDevice *GetBadDevice(const cChannel *Channel); + ///< Returns NULL if there is no device which uses the same LNB or if + ///< all of those devices are tuned to the same frequency band and + ///< polarization as of the requested channel. + ///< Otherwise returns the first device found. + int GetMaxBadPriority(const cChannel *Channel); + ///< Returns the highest priority of all receiving devices which use + ///< the same LNB and are tuned to a different frequency band or + ///< polarization as of the requested channel. + ///< Returns -1 if there are no such devices, but the primary device + ///< would be affected by switching to the requested channel. + ///< Returns -2 if there are no such devices and the primary device + ///< would not be affected by switching to the requested channel. +//ML-Ende + static void Shutdown(void); ///< Closes down all devices. ///< Must be called at the end of the program. @@ -223,6 +250,13 @@ bool SwitchChannel(const cChannel *Channel, bool LiveView); ///< Switches the device to the given Channel, initiating transfer mode ///< if necessary. + +//ML + bool SwitchChannelForced(const cChannel *Channel, bool LiveView); + ///< Switches the device to the given channel, initiating transfer mode + ///< if necessary. Forces the switch without taking care of the LNB configuration. +//ML-Ende + static bool SwitchChannel(int Direction); ///< Switches the primary device to the next available channel in the given ///< Direction (only the sign of Direction is evaluated, positive values diff -u -r vdr-1.3.42-orig/eitscan.c vdr-1.3.42/eitscan.c --- vdr-1.3.42-orig/eitscan.c 2006-01-07 15:10:17.000000000 +0100 +++ vdr-1.3.42/eitscan.c 2006-02-05 18:00:53.000000000 +0100 @@ -151,9 +151,11 @@ if (Device->ProvidesTransponder(Channel)) { if (!Device->Receiving()) { bool MaySwitchTransponder = Device->MaySwitchTransponder(); - if (MaySwitchTransponder || Device->ProvidesTransponderExclusively(Channel) && now - lastActivity > Setup.EPGScanTimeout * 3600) { +//ML + if (MaySwitchTransponder && Device->GetMaxBadPriority(Channel) == -2 || Device->ProvidesTransponderExclusively(Channel) && Device->GetMaxBadPriority(Channel) <= -1 && now - lastActivity > Setup.EPGScanTimeout * 3600) { if (!MaySwitchTransponder) { - if (Device == cDevice::ActualDevice() && !currentChannel) { + if ((Device == cDevice::ActualDevice() || Device->GetMaxBadPriority(Channel) == -1) && !currentChannel) { +//ML-Ende cDevice::PrimaryDevice()->StopReplay(); // stop transfer mode currentChannel = Device->CurrentChannel(); Skins.Message(mtInfo, tr("Starting EPG scan")); diff -u -r vdr-1.3.42-orig/i18n.c vdr-1.3.42/i18n.c --- vdr-1.3.42-orig/i18n.c 2006-02-04 15:17:54.000000000 +0100 +++ vdr-1.3.42/i18n.c 2006-02-05 18:03:20.000000000 +0100 @@ -5928,6 +5928,76 @@ "Ingen titel", "Bez názvu", }, + +//ML + { "Channel locked by LNB!", + "Kanal durch LNB gesperrt!", + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "Chaîne interdite par la LNB", + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + }, + { "Setup.LNB$DVB device %d uses LNB No.", + "DVB-Empfänger %d nutzt LNB Nr.", + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "La carte DVB %d utilise la LNB No.", + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + }, + { "Setup.LNB$Log LNB usage", + "LNB-Nutzung protokollieren", + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + }, +//ML + { NULL } }; diff -u -r vdr-1.3.42-orig/menu.c vdr-1.3.42/menu.c --- vdr-1.3.42-orig/menu.c 2006-02-05 14:31:08.000000000 +0100 +++ vdr-1.3.42/menu.c 2006-02-05 18:00:53.000000000 +0100 @@ -2394,6 +2394,17 @@ Clear(); +//ML + char tmp[30]; + if (cDevice::NumDevices() > 1) { + for (int i = 1; i <= cDevice::NumDevices(); i++) { + sprintf( tmp, tr("Setup.LNB$DVB device %d uses LNB No."), i); + Add(new cMenuEditIntItem( tmp, &data.CardUsesLNBnr[i - 1], 1, cDevice::NumDevices() )); + } + } + Add(new cMenuEditBoolItem(tr("Setup.LNB$Log LNB usage"), &data.VerboseLNBlog)); +//ML-Ende + Add(new cMenuEditBoolItem(tr("Setup.LNB$Use DiSEqC"), &data.DiSEqC)); if (!data.DiSEqC) { Add(new cMenuEditIntItem( tr("Setup.LNB$SLOF (MHz)"), &data.LnbSLOF)); @@ -2410,6 +2421,10 @@ int oldDiSEqC = data.DiSEqC; eOSState state = cMenuSetupBase::ProcessKey(Key); +//ML + if (Key == kOk) cDevice::SetLNBnr(); +//ML-Ende + if (Key != kNone && data.DiSEqC != oldDiSEqC) Setup(); return state; @@ -3598,6 +3613,21 @@ int Priority = Timer ? Timer->Priority() : Pause ? Setup.PausePriority : Setup.DefaultPriority; cDevice *device = cDevice::GetDevice(channel, Priority, &NeedsDetachReceivers); if (device) { + +//ML + cDevice *tmpDevice; + while ((tmpDevice = device->GetBadDevice(channel))) { + if (tmpDevice->Replaying() == false) { + Stop(tmpDevice); + if (tmpDevice->IsPrimaryDevice() ) + tmpDevice->SwitchChannelForced(channel, true); + else + tmpDevice->SwitchChannelForced(channel, false); + } else + tmpDevice->SwitchChannelForced(channel, false); + } +//ML-Ende + if (NeedsDetachReceivers) { Stop(device); if (device == cTransferControl::ReceiverDevice())