Ticket #2821: eject_fix.diff

DVDRingBuffer.h

@@ -75 +75 @@
     bool OpenFile(const QString &filename);
     void PlayTitleAndPart(int _title, int _part) 
         { dvdnav_part_play(dvdnav, _title, _part); }
-    void close(void);
+    void CloseDVD(void);
     bool nextTrack(void);
     void prevTrack(void);
     int  safe_read(void *data, unsigned sz);

DVDRingBuffer.cpp

@@ -6 +6 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
+#include <unistd.h>
 #endif
 
 
@@ -63 +64 @@
 
 DVDRingBufferPriv::~DVDRingBufferPriv()
 {
-    close();
+    CloseDVD();
     ClearMenuSPUParameters();
 }
 
-void DVDRingBufferPriv::close(void)
+void DVDRingBufferPriv::CloseDVD(void)
 {
     if (dvdnav)
     {
@@ -1241 +1242 @@
 
     if (ioctl(fd, SG_IO, &sghdr) < 0)
         VERBOSE(VB_PLAYBACK, LOC_ERR + "Limit DVD Speed Failed");
-    
+   
+    close(fd);
     VERBOSE(VB_PLAYBACK, LOC + "Limiting DVD Speed Successful");
 #else
     (void)speed;