Version 1.1.33vdr-1.1.33

- Modified handling of audio packets in cDvbPlayer for better sync with external
  AC3 replay (thanks to Werner Fink).
- Fixed a memory leak in cNonBlockingFileReader (thanks to Stefan Huelswitt).
- Completed the French OSD texts (thanks to Gregoire Favre).
- Completed the Finnish OSD texts (thanks to Niko Tarnanen and Rolf Ahrenberg).
- Fixed I/O handling in case an explicit controlling terminal is given (thanks
  to Oliver Endriss).
- Fixed resume file handling in case the resume.vdr file can't be written
  (thanks to Gerhard Steiner).
- Fixed cutting a recording if there is only a single editing mark (thanks to
  Ralf Klueber for reporting this one).
- Fixed volume display in case a plugin has its own OSD open (thanks to Marcel
  Wiesweg).
- Fixed channel switching in the EPG scanner on single device systems.
- Completed the Swedish OSD texts (thanks to Tomas Prybil).
- Now switching to the channel used by the most recently started timer in case
  the original current channel becomes unavailable due to a recording on a
  different transponder. If this fails, a channel up/down switch is attempted as
  a fallback solution (thanks to Lauri Tischler for reporting this one, and to
  Hermann Gausterer for suggesting to switch to the recording channel).
- Fixed cReplayControl::Show() to avoid a compiler warning in g++ 3.2.3 (thanks
  to Jan Ekholm for reporting this one).
- Completed the Slovenian OSD texts (thanks to Matjaz Thaler).
- Changed the DEFAULTPRIORITY in device.c to -1, so that the primary device
  will be used for FTA recordings in case the CAM is connected to a non-primary
  device (thanks to Reinhard Walter Buchner for reporting this one).
- The cCiHandler now closes its file handle when it gets destroyed.
- Checking for duplicate recordings with the same file name and disabling the
  second timer (thanks to Peter Bieringer for reporting this one).
- Fixed handling newly created timers in case they are not confirmed with "Ok"
  (thanks to Gerhard Steiner for reporting this one).
- It is now possible to directly delete a timer that is currently recording
  (thanks to Alexander Damhuis for reporting this one).

1 files changed, 12 insertions, 6 deletions

diff --git a/vdr.c b/vdr.c
index 7962c0a..8bb907c 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.155 2003/05/16 12:11:45 kls Exp $
+ * $Id: vdr.c 1.159 2003/05/24 15:17:38 kls Exp $
  */
 
 #include <getopt.h>
@@ -323,6 +323,7 @@ int main(int argc, char *argv[])
      stdin  = freopen(Terminal, "r", stdin);
      stdout = freopen(Terminal, "w", stdout);
      stderr = freopen(Terminal, "w", stderr);
+     HasStdin = true;
      }
 
   isyslog("VDR version %s started", VDRVERSION);
@@ -429,8 +430,6 @@ int main(int argc, char *argv[])
   else
      cDevice::PrimaryDevice()->SetVolume(Setup.CurrentVolume, true);
 
-  cEITScanner EITScanner;
-
   cSIProcessor::Read();
 
   // Signal handlers:
@@ -454,6 +453,7 @@ int main(int argc, char *argv[])
   cOsdObject *Menu = NULL;
   cOsdObject *Temp = NULL;
   int LastChannel = -1;
+  int LastTimerChannel = -1;
   int PreviousChannel = cDevice::CurrentChannel();
   time_t LastActivity = 0;
   int MaxLatencyTime = 0;
@@ -469,11 +469,15 @@ int main(int argc, char *argv[])
         // Attach launched player control:
         cControl::Attach();
         // Make sure we have a visible programme in case device usage has changed:
-        if (cDevice::PrimaryDevice()->HasDecoder() && !cDevice::PrimaryDevice()->HasProgramme()) {
+        if (!EITScanner.Active() && cDevice::PrimaryDevice()->HasDecoder() && !cDevice::PrimaryDevice()->HasProgramme()) {
            static time_t lastTime = 0;
            if (time(NULL) - lastTime > MINCHANNELWAIT) {
-              if (!Channels.SwitchTo(cDevice::CurrentChannel()))
+              if (!Channels.SwitchTo(cDevice::CurrentChannel()) // try to switch to the original channel...
+                  && !(LastTimerChannel > 0 && Channels.SwitchTo(LastTimerChannel)) // ...or the one used by the last timer...
+                  && !cDevice::SwitchChannel(1) // ...or the next higher available one...
+                  && !cDevice::SwitchChannel(-1)) // ...or the next lower available one
                  lastTime = time(NULL); // don't do this too often
+              LastTimerChannel = -1;
               }
            }
         // Restart the Watchdog timer:
@@ -500,6 +504,8 @@ int main(int argc, char *argv[])
            if (Timer) {
               if (!cRecordControls::Start(Timer))
                  Timer->SetPending(true);
+              else
+                 LastTimerChannel = Timer->Channel()->Number();
               }
            }
         // CAM control:
@@ -563,7 +569,7 @@ int main(int argc, char *argv[])
                   }
                else
                   cDevice::PrimaryDevice()->SetVolume(NORMALKEY(key) == kVolDn ? -VOLUMEDELTA : VOLUMEDELTA);
-               if (!Interface->IsOpen())
+               if (!Menu && !Interface->IsOpen())
                   Menu = Temp = cDisplayVolume::Create();
                cDisplayVolume::Process(key);
                key = kNone; // nobody else needs to see these keys