Version 0.96vdr-0.96

- Made VDR compile with libdvdread-0.9.1 (thanks to Andreas Schultz).
  Note that you now _need_ version 0.9.1 of libdvdread to compile VDR with
  DVD support!
- Several fixes to the replay mode display (thanks to Stefan Huelswitt):
  no more replay mode display when pressing the "Green" or "Yellow" button
  (Skip +/-60s); fixed timeout when pressing '0' to set an editing mark while
  the progress display is not shown; mode display is shown after progress
  display is closed; pressing "Ok" while the mode display is on brings up
  the progress display; no more unnecessary display of "normal play mode".
- Supplying the new frontend parameter 'Inversion' (currently it is always
  set to INVERSION_AUTO, which should work with all channels on Astra).
- Removing unnecessary double quotes from EPG Subtitle in EPGBugfixLevel >=1.
- EPG info is now updated if the contents changes but the ID remains the same.
- Fixed handling SVDRP commands whith more than one blank between the command
  word and the options.
- The current volume setting is now saved to setup.conf and restored at the
  next program start.
- New command line option '-r' to define a command that gets called before and
  after each recording (see INSTALL for details).
- Implemented a check to see whether the system time is running linearly.
- Writing the current time (as seen by VDR) into the log file when starting
  a timer recording (this may help debugging cases where timers don't start
  at the expected time).
- Made the volume, mute and power keys work when a menu is active, too (thanks
  to Matthias Weingart).

1 files changed, 15 insertions, 8 deletions

diff --git a/dvbapi.c b/dvbapi.c
index 16b3e30..8a6e691 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -7,7 +7,7 @@
  * DVD support initially written by Andreas Schultz <aschultz@warp10.net>
  * based on dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>
  *
- * $Id: dvbapi.c 1.125 2001/09/16 13:55:03 kls Exp $
+ * $Id: dvbapi.c 1.129 2001/09/23 13:44:27 kls Exp $
  */
 
 //#define DVDDEBUG        1
@@ -1670,7 +1670,7 @@ void cDVDplayBuffer::Input(void)
                  /**
                   * Parse the contained dsi packet.
                   */
-                 navRead_DSI(&dsi_pack, &(data[DSI_START_BYTE]), sizeof(dsi_t));
+                 navRead_DSI(&dsi_pack, &(data[DSI_START_BYTE]));
                  if (cur_pack != dsi_pack.dsi_gi.nv_pck_lbn) {
                     esyslog(LOG_ERR, "ERROR: cur_pack != dsi_pack.dsi_gi.nv_pck_lbn");
                     return;
@@ -1748,7 +1748,7 @@ void cDVDplayBuffer::Input(void)
                  dsyslog(LOG_INFO, "DVD: read pack: %d", cur_pack);
 #endif
                  int len = DVDReadBlocks(title, cur_pack, cur_output_size, data);
-                 if (len != (int)cur_output_size * DVD_VIDEO_LB_LEN) {
+                 if (len != (int)cur_output_size) {
                     esyslog(LOG_ERR, "ERROR: read failed for %d blocks at %d", cur_output_size, cur_pack);
                     doplay = false;
                     break;
@@ -2406,16 +2406,18 @@ void cCuttingBuffer::Action(void)
 
 // --- cVideoCutter ----------------------------------------------------------
 
+char *cVideoCutter::editedVersionName = NULL;
 cCuttingBuffer *cVideoCutter::cuttingBuffer = NULL;
 
 bool cVideoCutter::Start(const char *FileName)
 {
   if (!cuttingBuffer) {
      cRecording Recording(FileName);
-     const char *EditedVersionName = Recording.PrefixFileName('%');
-     if (EditedVersionName && RemoveVideoFile(EditedVersionName) && MakeDirs(EditedVersionName, true)) {
+     const char *evn = Recording.PrefixFileName('%');
+     if (evn && RemoveVideoFile(evn) && MakeDirs(evn, true)) {
+        editedVersionName = strdup(evn);
         Recording.WriteSummary();
-        cuttingBuffer = new cCuttingBuffer(FileName, EditedVersionName);
+        cuttingBuffer = new cCuttingBuffer(FileName, editedVersionName);
         return true;
         }
      }
@@ -2434,6 +2436,9 @@ bool cVideoCutter::Active(void)
      if (cuttingBuffer->Active())
         return true;
      Stop();
+     cRecordingUserCommand::InvokeCommand(RUC_EDITEDRECORDING, editedVersionName);
+     delete editedVersionName;
+     editedVersionName = NULL;
      }
   return false;
 }
@@ -2540,7 +2545,7 @@ cDvbApi::cDvbApi(int n)
 #endif
   currentChannel = 1;
   mute = false;
-  volume = 255;
+  volume = MAXVOLUME;
 }
 
 cDvbApi::~cDvbApi()
@@ -3252,6 +3257,7 @@ eSetChannelResult cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char
 
         FrontendParameters Frontend;
         Frontend.Frequency = freq * 1000UL;
+        Frontend.Inversion = INVERSION_AUTO;
         Frontend.u.qpsk.SymbolRate = Srate * 1000UL;
         Frontend.u.qpsk.FEC_inner = FEC_AUTO;
 
@@ -3298,6 +3304,7 @@ eSetChannelResult cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char
 
         FrontendParameters Frontend;
         Frontend.Frequency = FrequencyMHz * 1000000UL;
+        Frontend.Inversion = INVERSION_AUTO;
         Frontend.u.qam.SymbolRate = Srate * 1000UL;
         Frontend.u.qam.FEC_inner = FEC_AUTO;
         Frontend.u.qam.QAM = QAM_64;
@@ -3635,7 +3642,7 @@ void cDvbApi::ToggleMute(void)
 void cDvbApi::SetVolume(int Volume, bool Absolute)
 {
   if (fd_audio >= 0) {
-     volume = min(max(Absolute ? Volume : volume + Volume, 0), 255);
+     volume = min(max(Absolute ? Volume : volume + Volume, 0), MAXVOLUME);
      audioMixer_t am;
      am.volume_left = am.volume_right = volume;
      CHECK(ioctl(fd_audio, AUDIO_SET_MIXER, &am));