Changeset 163 for smplayer/vendor/current/src/prefdrives.cpp

Timestamp:

May 15, 2014, 7:53:54 PM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update vendor to 0.8.7

File:

• smplayer/vendor/current/src/prefdrives.cpp (modified) (12 diffs)

smplayer/vendor/current/src/prefdrives.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -56 +56 @@
 #endif
 
+#ifndef BLURAY_SUPPORT
+        bluray_widget->hide();
+        bluray_sep->hide();
+#endif
+
         updateDriveCombos();
 
@@ -79 +84 @@
         cdrom_drive_icon->setPixmap( Images::icon("cdrom_drive") );
         dvd_drive_icon->setPixmap( Images::icon("dvd_drive") );
+#ifdef BLURAY_SUPPORT
+        bluray_drive_icon->setPixmap( Images::icon("bluray_drive") );
+#endif
 
         createHelp();
@@ -89 +97 @@
         QString current_dvd_device = dvdDevice();
         QString current_cd_device = cdromDevice();
+#ifdef BLURAY_SUPPORT
+        QString current_bluray_device = blurayDevice();
+#endif
 
         dvd_device_combo->clear();
         cdrom_device_combo->clear();
+#ifdef BLURAY_SUPPORT
+        bluray_device_combo->clear();
+#endif
 
         // DVD device combo
@@ -105 +119 @@
                         dvd_device_combo->addItem( s );
                         cdrom_device_combo->addItem( s );
+                        #ifdef BLURAY_SUPPORT
+                        bluray_device_combo->addItem( s );
+                        #endif
                 }
         }
@@ -116 +133 @@
                 dvd_device_combo->addItem(device_name);
                 cdrom_device_combo->addItem(device_name);
+                #ifdef BLURAY_SUPPORT
+                bluray_device_combo->addItem(device_name);
+                #endif
         }
 #endif
@@ -122 +142 @@
         setDVDDevice( current_dvd_device );
         setCDRomDevice( current_cd_device );
+#ifdef BLURAY_SUPPORT
+        setBlurayDevice( current_bluray_device );
+#endif
 }
 
@@ -127 +150 @@
         setDVDDevice( pref->dvd_device );
         setCDRomDevice( pref->cdrom_device );
+#ifdef BLURAY_SUPPORT
+        setBlurayDevice( pref->bluray_device );
+#endif
 
 #if DVDNAV_SUPPORT
@@ -138 +164 @@
         pref->dvd_device = dvdDevice();
         pref->cdrom_device = cdromDevice();
+#ifdef BLURAY_SUPPORT
+        pref->bluray_device = blurayDevice();
+#endif
 
 #if DVDNAV_SUPPORT
@@ -151 +180 @@
         return dvd_device_combo->currentText();
 }
+
+#ifdef BLURAY_SUPPORT
+void PrefDrives::setBlurayDevice( QString dir ) {
+        bluray_device_combo->setCurrentText( dir );
+}
+
+QString PrefDrives::blurayDevice() {
+        return bluray_device_combo->currentText();
+}
+#endif
 
 void PrefDrives::setCDRomDevice( QString dir ) {
@@ -187 +226 @@
 #if DVDNAV_SUPPORT
         setWhatsThis(use_dvdnav_check, tr("Enable DVD menus"),
-                tr("If this option is checked, smplayer will play DVDs using "
-           "dvdnav. Requires a recent version of mplayer compiled with dvdnav "
+                tr("If this option is checked, SMPlayer will play DVDs using "
+           "dvdnav. Requires a recent version of MPlayer compiled with dvdnav "
            "support.") +"<br>" +
         tr("<b>Note 1</b>: cache will be disabled, this can affect performance.") +"<br>"+
@@ -196 +235 @@
            "issues with it."));
 #endif
+
+#ifdef BLURAY_SUPPORT
+        setWhatsThis(bluray_device_combo, tr("Blu-ray device"),
+                tr("Choose your Blu-ray device. It will be used to play Blu-ray discs.") );
+#endif
 }