Changeset 175 for smplayer/vendor/current/src/filepropertiesdialog.cpp

Timestamp:

May 3, 2016, 2:14:41 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update vendor to version 16.4

File:

• smplayer/vendor/current/src/filepropertiesdialog.cpp (modified) (8 diffs)

smplayer/vendor/current/src/filepropertiesdialog.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -24 +24 @@
 #include "images.h"
 #include "infofile.h"
-
+#include "playerid.h"
 
 FilePropertiesDialog::FilePropertiesDialog( QWidget* parent, Qt::WindowFlags f )
@@ -37 +37 @@
         connect( applyButton, SIGNAL(clicked()), this, SLOT(apply()) );
 
+#if ALLOW_DEMUXER_CODEC_CHANGE
         codecs_set = false;
-
-        // Read codec info from InfoReader:
-        InfoReader *i = InfoReader::obj();
-        setCodecs( i->vcList(), i->acList(), i->demuxerList() );
+#else
+        // Hide unused tabs
+        int i = tabWidget->indexOf(demuxer_page);
+        if (i != -1) tabWidget->removeTab(i);
+        i = tabWidget->indexOf(vc_page);
+        if (i != -1) tabWidget->removeTab(i);
+        i = tabWidget->indexOf(ac_page);
+        if (i != -1) tabWidget->removeTab(i);
+#endif
 
         retranslateStrings();
@@ -73 +79 @@
 #endif
 
+#if ALLOW_DEMUXER_CODEC_CHANGE
+        int tab_idx = 4;
+#else
+        int tab_idx = 1;
+#endif
+        tabWidget->setTabText(tab_idx, tr("O&ptions for %1").arg(PLAYER_NAME) );
+        groupBox->setTitle( tr("Additional Options for %1").arg(PLAYER_NAME) );
+        options_info_label->setText( tr("Here you can pass extra options to %1.").arg(PLAYER_NAME) +"<br>"+
+                tr("Write them separated by spaces.") + "<br>" + tr("Example:") + " -volume 50 -fps 25" );
 }
 
@@ -90 +105 @@
 }
 
+#if ALLOW_DEMUXER_CODEC_CHANGE
 void FilePropertiesDialog::setCodecs(InfoList vc, InfoList ac, InfoList demuxer) 
 {
@@ -96 +112 @@
         demuxerlist = demuxer;
 
+        qSort(vclist);
+        qSort(aclist);
+        qSort(demuxerlist);
+
+        vc_listbox->clear();
+        ac_listbox->clear();
+        demuxer_listbox->clear();
+
         InfoList::iterator it;
 
@@ -110 +134 @@
         }
 
-        codecs_set = true;      
+        codecs_set = true;
 }
 
@@ -189 +213 @@
         return -1;
 }
+#endif
 
 void FilePropertiesDialog::setMplayerAdditionalArguments(QString args) {