Ticket #3355: restore_dvd_speed_seeking.diff

DVDRingBuffer.h

@@ -100 +100 @@
     uint8_t GetNumAudioChannels(int id);
     void JumpToTitle(bool change) { jumptotitle = change; }
     void SeekCellStart(void);
-    void SetDVDSpeed(const char *device, int speed);
+    void SetDVDSpeed(void);
+    void SetDVDSpeed(int speed);
 
     void SetParent(NuppelVideoPlayer *p) { parent = p; }
 

DVDRingBuffer.cpp

@@ -72 +72 @@
 {
     if (dvdnav)
     {
-        SetDVDSpeed(dvdFilename, -1);
+        SetDVDSpeed(-1);
         dvdnav_close(dvdnav);
         dvdnav = NULL;
     }            
@@ -135 +135 @@
 bool DVDRingBufferPriv::OpenFile(const QString &filename) 
 {
     dvdFilename = filename.ascii();
-    int dvdDriveSpeed = gContext->GetNumSetting("DVDDriveSpeed", 2);
     dvdnav_status_t dvdRet = dvdnav_open(&dvdnav, filename.local8Bit());
     if (dvdRet == DVDNAV_STATUS_ERR)
     {
@@ -189 +188 @@
         dvdnav_get_serial_number(dvdnav, &serialnum);
         dvdname = QString(name);
         serialnumber = QString(serialnum);
-    
-        SetDVDSpeed(dvdFilename, dvdDriveSpeed);
-
+        SetDVDSpeed(); 
         return true;
     }
 }
 
-/** \fn DVDRingBufferPriv::GetReadPosition()
- *  \brief returns current position in the PGC.
+/** \brief returns current position in the PGC.
  */
 long long DVDRingBufferPriv::GetReadPosition(void)
 {
@@ -1150 +1191 @@
     Seek(cellStart);
 }
 
-/*
- * \brief obtained from the mplayer project
+/** \brief set dvd speed. uses the DVDDriveSpeed Setting from the settings 
+ * table
  */
-void DVDRingBufferPriv::SetDVDSpeed(const char *device, int speed)
+void DVDRingBufferPriv::SetDVDSpeed(void)
 {
+    int dvdDriveSpeed = gContext->GetNumSetting("DVDDriveSpeed", 12);
+    SetDVDSpeed(dvdDriveSpeed);
+}
+
+/** \brief set dvd speed. 
+ *  \param dvd drive speed. example if speed is 1, then function sets dvd speed to 2048kb/s
+ */
+void DVDRingBufferPriv::SetDVDSpeed(int speed)
+{
 #if defined(__linux__) && defined(SG_IO) && defined(GPCMD_SET_STREAMING)
     int fd;
     unsigned char buffer[28];
@@ -1163 +1213 @@
     struct sg_io_hdr sghdr;
     struct stat st;
 
+    const char *device = dvdFilename;
     memset(&sghdr, 0, sizeof(sghdr));
     memset(buffer, 0, sizeof(buffer));
     memset(sense, 0, sizeof(sense));
     memset(cmd, 0, sizeof(cmd));
     memset(&st, 0, sizeof(st));
 
+    QMutexLocker lock(&seekLock);
+   
     if (stat(device, &st) == -1 ) 
     {
         VERBOSE(VB_PLAYBACK, LOC_ERR +

NuppelVideoPlayer.cpp

@@ -3794 +3794 @@
 {
     bool skip_changed;
 
+    if (ringBuffer->isDVD())
+    {
+        if (GetDecoder())
+            GetDecoder()->UpdateDVDFramesPlayed();
+        if (play_speed != normal_speed)
+            ringBuffer->DVD()->SetDVDSpeed(-1);
+        else
+            ringBuffer->DVD()->SetDVDSpeed();
+    }
+
     if (play_speed > 0.0f && play_speed <= 3.0f)
     {
         skip_changed = (ffrew_skip != 1);