Changeset 119 for smplayer/trunk/src/prefgeneral.cpp

Timestamp:

Dec 27, 2011, 5:44:12 PM (14 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: latest svn update

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/prefgeneral.cpp (modified) (16 diffs)

smplayer/trunk/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
@@ -61 +62 @@
 
 #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
-        vdpau_filters_check->hide();
+        vdpau_button->hide();
 #endif
 
@@ -157 +158 @@
 #else
 #ifdef Q_OS_OS2
-                vo = "kva";
+                vo = "kva";
 #else
                 vo = "xv,";
@@ -168 +169 @@
 
 #ifdef Q_OS_OS2
-       if (ao.isEmpty()) {
-           if (pref->mplayer_detected_version >= MPLAYER_KAI_VERSION) {
-              ao = "kai";
-           } else {
-              ao = "dart";
-           }
-        }
+        if (ao.isEmpty()) {
+                if (pref->mplayer_detected_version >= MPLAYER_KAI_VERSION) {
+                        ao = "kai";
+                } else {
+                        ao = "dart";
+                }
+        }
 #endif
 
@@ -214 +215 @@
 
 #if !defined(Q_OS_WIN) && !defined(Q_OS_OS2)
-        setDisableFiltersWithVdpau( pref->disable_video_filters_with_vdpau );
+        vdpau = pref->vdpau;
 #endif
 
@@ -242 +243 @@
                 //setDrivers( i.voList(), i.aoList() );
 #ifdef Q_OS_OS2
-                vo_list = i.voList();
-                ao_list = i.aoList();
-                updateDriverCombos();
+                vo_list = i.voList();
+                ao_list = i.aoList();
+                updateDriverCombos();
 #endif
         }
@@ -301 +302 @@
 
 #if !defined(Q_OS_WIN) && !defined(Q_OS_OS2)
-        TEST_AND_SET(pref->disable_video_filters_with_vdpau, disableFiltersWithVdpau());
+        pref->vdpau = vdpau;
 #endif
 
@@ -332 +333 @@
 #else
 #ifdef Q_OS_OS2
-                if ( vo == "kva") {
-                        vo_combo->addItem( "kva (" + tr("fast") + ")", "kva" );
+                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
-#else
-
+                }
+                else
+#else
                 /*
                 if (vo == "xv") vo_combo->addItem( "xv (" + tr("fastest") + ")", vo);
@@ -385 +385 @@
                 ao_combo->addItem( ao, ao );
 #ifdef Q_OS_OS2
-                if ( ao == "kai") {
+                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
@@ -761 +761 @@
 #endif
 
-#if !defined(Q_OS_WIN) && !defined(Q_OS_OS2)
-void PrefGeneral::setDisableFiltersWithVdpau(bool b) {
-        vdpau_filters_check->setChecked(b);
-}
-
-bool PrefGeneral::disableFiltersWithVdpau() {
-        return vdpau_filters_check->isChecked();
-}
-#endif
-
 void PrefGeneral::setBlackbordersOnFullscreen(bool b) {
         blackborders_on_fs_check->setChecked(b);
@@ -800 +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
 }
 
@@ -808 +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() {
@@ -868 +889 @@
 #else
 #ifdef Q_OS_OS2
-                  .arg("<b><i>kva</i></b>")
+                  .arg("<b><i>kva</i></b>")
 #else
                   .arg("<b><i>xv</i></b>")
@@ -876 +897 @@
 
 #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
 
@@ -960 +983 @@
 #ifdef Q_OS_OS2
         + " " +
-                tr("%1 is the recommended one. %2 is only available on older MPlayer (before version %3)")
+                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>")