Changeset 118 for smplayer/vendor/current/src/prefgeneral.cpp

Timestamp:

Dec 22, 2011, 6:27:52 PM (14 years ago)

Author:

Silvan Scherrer

Message:

smplayer vendor udate

File:

• smplayer/vendor/current/src/prefgeneral.cpp (modified) (22 diffs)

smplayer/vendor/current/src/prefgeneral.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2010 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
 
     This program is free software; you can redistribute it and/or modify
@@ -24 +24 @@
 #include "mediasettings.h"
 #include "paths.h"
+#include "vdpauproperties.h"
 
 #if USE_ALSA_DEVICES || USE_DSOUND_DEVICES
@@ -54 +55 @@
 
         // Screensaver
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
         screensaver_check->hide();
 #else
@@ -60 +61 @@
 #endif
 
-#ifdef Q_OS_WIN
-        vdpau_filters_check->hide();
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
+        vdpau_button->hide();
 #endif
 
@@ -121 +122 @@
 
         mplayerbin_edit->setCaption(tr("Select the mplayer executable"));
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
         mplayerbin_edit->setFilter(tr("Executables") +" (*.exe)");
 #else
@@ -156 +157 @@
                 }
 #else
+#ifdef Q_OS_OS2
+                vo = "kva";
+#else
                 vo = "xv,";
 #endif
+#endif
         }
         setVO( vo );
 
         QString ao = pref->ao;
+
+#ifdef Q_OS_OS2
+        if (ao.isEmpty()) {
+                if (pref->mplayer_detected_version >= MPLAYER_KAI_VERSION) {
+                        ao = "kai";
+                } else {
+                        ao = "dart";
+                }
+        }
+#endif
+
         setAO( ao );
 
@@ -191 +207 @@
         setAutoq( pref->autoq );
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
         setAvoidScreensaver( pref->avoid_screensaver );
         setTurnScreensaverOff( pref->turn_screensaver_off );
@@ -198 +214 @@
 #endif
 
-#ifndef Q_OS_WIN
-        setDisableFiltersWithVdpau( pref->disable_video_filters_with_vdpau );
+#if !defined(Q_OS_WIN) && !defined(Q_OS_OS2)
+        vdpau = pref->vdpau;
 #endif
 
@@ -226 +242 @@
                 // Update the drivers list at the same time
                 //setDrivers( i.voList(), i.aoList() );
+#ifdef Q_OS_OS2
+                vo_list = i.voList();
+                ao_list = i.aoList();
+                updateDriverCombos();
+#endif
         }
 
@@ -273 +294 @@
         TEST_AND_SET(pref->autoq, autoq());
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
         pref->avoid_screensaver = avoidScreensaver();
         TEST_AND_SET(pref->turn_screensaver_off, turnScreensaverOff());
@@ -280 +301 @@
 #endif
 
-#ifndef Q_OS_WIN
-        TEST_AND_SET(pref->disable_video_filters_with_vdpau, disableFiltersWithVdpau());
+#if !defined(Q_OS_WIN) && !defined(Q_OS_OS2)
+        pref->vdpau = vdpau;
 #endif
 
@@ -308 +329 @@
                         vo_combo->addItem( "directx (" + tr("fast") + ")", "directx" );
                         vo_combo->addItem( "directx (" + tr("slow") + ")", "directx:noaccel" );
+                }
+                else
+#else
+#ifdef Q_OS_OS2
+                if ( vo == "kva") {
+                        vo_combo->addItem( "kva (" + tr("fast") + ")", "kva" );
+                        vo_combo->addItem( "kva (" + tr("snap mode") + ")", "kva:snap" );
+                        vo_combo->addItem( "kva (" + tr("slower dive mode") + ")", "kva:dive" );
                 }
                 else
@@ -326 +355 @@
 #endif // USE_XV_ADAPTORS
 #endif
+#endif
                 if (vo == "x11") vo_combo->addItem( "x11 (" + tr("slow") + ")", vo);
                 else
@@ -354 +384 @@
                 ao = ao_list[n].name();
                 ao_combo->addItem( ao, ao );
+#ifdef Q_OS_OS2
+                if ( ao == "kai") {
+                        ao_combo->addItem( "kai (" + tr("uniaud mode") + ")", "kai:uniaud" );
+                        ao_combo->addItem( "kai (" + tr("dart mode") + ")", "kai:dart" );
+                }
+#endif
 #if USE_ALSA_DEVICES
                 if ((ao == "alsa") && (!alsa_devices.isEmpty())) {
@@ -699 +735 @@
 }
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
 void PrefGeneral::setAvoidScreensaver(bool b) {
         avoid_screensaver_check->setChecked(b);
@@ -722 +758 @@
 bool PrefGeneral::disableScreensaver() {
         return screensaver_check->isChecked();
-}
-#endif
-
-#ifndef Q_OS_WIN
-void PrefGeneral::setDisableFiltersWithVdpau(bool b) {
-        vdpau_filters_check->setChecked(b);
-}
-
-bool PrefGeneral::disableFiltersWithVdpau() {
-        return vdpau_filters_check->isChecked();
 }
 #endif
@@ -764 +790 @@
         vo_user_defined_edit->setShown(visible);
         vo_user_defined_edit->setFocus();
+
+#ifndef Q_OS_WIN
+        bool vdpau_button_visible = (vo_combo->itemData(idx).toString() == "vdpau");
+        vdpau_button->setShown(vdpau_button_visible);
+#endif
 }
 
@@ -772 +803 @@
         ao_user_defined_edit->setFocus();
 }
+
+#ifndef Q_OS_WIN
+void PrefGeneral::on_vdpau_button_clicked() {
+        qDebug("PrefGeneral::on_vdpau_button_clicked");
+
+        VDPAUProperties d(this);
+
+        d.setffh264vdpau(vdpau.ffh264vdpau);
+        d.setffmpeg12vdpau(vdpau.ffmpeg12vdpau);
+        d.setffwmv3vdpau(vdpau.ffwmv3vdpau);
+        d.setffvc1vdpau(vdpau.ffvc1vdpau);
+        d.setffodivxvdpau(vdpau.ffodivxvdpau);
+
+        d.setDisableFilters(vdpau.disable_video_filters);
+
+        if (d.exec() == QDialog::Accepted) {
+                vdpau.ffh264vdpau = d.ffh264vdpau();
+                vdpau.ffmpeg12vdpau = d.ffmpeg12vdpau();
+                vdpau.ffwmv3vdpau = d.ffwmv3vdpau();
+                vdpau.ffvc1vdpau = d.ffvc1vdpau();
+                vdpau.ffodivxvdpau = d.ffodivxvdpau();
+
+                vdpau.disable_video_filters = d.disableFilters();
+        }
+}
+#endif
 
 void PrefGeneral::createHelp() {
@@ -831 +888 @@
                   .arg("<b><i>directx</i></b>")
 #else
+#ifdef Q_OS_OS2
+                  .arg("<b><i>kva</i></b>")
+#else
                   .arg("<b><i>xv</i></b>")
 #endif
+#endif
                 );
 
-#ifndef Q_OS_WIN
+#if !defined(Q_OS_WIN) && !defined(Q_OS_OS2)
+        /*
         setWhatsThis(vdpau_filters_check, tr("Disable video filters when using vdpau"),
                 tr("Usually video filters won't work when using vdpau as video output "
            "driver, so it's wise to keep this option checked.") );
+        */
 #endif
 
@@ -892 +955 @@
            "subtitles automatically in the black borders.") */ );
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
         setWhatsThis(turn_screensaver_off_check, tr("Switch screensaver off"),
                 tr("This option switches the screensaver off just before starting to "
@@ -918 +981 @@
                 tr("Select the audio output driver.") 
 #ifndef Q_OS_WIN
+#ifdef Q_OS_OS2
+        + " " +
+                tr("%1 is the recommended one. %2 is only available on older MPlayer (before version %3)")
+           .arg("<b><i>kai</i></b>")
+           .arg("<b><i>dart</i></b>")
+           .arg(MPLAYER_KAI_VERSION)
+#else
         + " " + 
                 tr("%1 is the recommended one. Try to avoid %2 and %3, they are slow "
@@ -924 +994 @@
            .arg("<b><i>esd</i></b>")
            .arg("<b><i>arts</i></b>")
+#endif
 #endif
                 );