[vlmc-devel] commit: Media: Reorder the extension list, so avi is first. ( Hugo Beauzée-Luyssen )

[git at videolan.org]

vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Mon Oct 11 01:58:16 2010 +0200| [4c00fc2b550638076820d5f28b451222c328fd18] | committer: Hugo Beauzée-Luyssen 

Media: Reorder the extension list, so avi is first.

On KDE (maybe other window manager, but I didn't test those) the first
extension was used as the default one.
This is probably not the cleaner way, but it works for now.

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=4c00fc2b550638076820d5f28b451222c328fd18
---

 src/Gui/MainWindow.cpp              |    4 ++--
 src/Gui/export/RendererSettings.cpp |    6 +++---
 src/Gui/export/RendererSettings.h   |    2 +-
 src/Media/Media.cpp                 |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp
index eaf40f1..dd3df68 100644
--- a/src/Gui/MainWindow.cpp
+++ b/src/Gui/MainWindow.cpp
@@ -634,9 +634,9 @@ MainWindow::renderVideo( const QString& outputFileName, quint32 width, quint32 h
 }
 
 bool
-MainWindow::renderVideoSettings( bool exportType )
+MainWindow::renderVideoSettings( bool shareOnInternet )
 {
-    RendererSettings *settings = new RendererSettings( exportType );
+    RendererSettings *settings = new RendererSettings( shareOnInternet );
 
     if ( settings->exec() == QDialog::Rejected )
     {
diff --git a/src/Gui/export/RendererSettings.cpp b/src/Gui/export/RendererSettings.cpp
index 11f4415..c27bd18 100644
--- a/src/Gui/export/RendererSettings.cpp
+++ b/src/Gui/export/RendererSettings.cpp
@@ -31,11 +31,11 @@
 #include <QFileInfo>
 #include <QMessageBox>
 
-RendererSettings::RendererSettings( bool exportType )
+RendererSettings::RendererSettings( bool shareOnInternet )
 {
-    m_ui.setupUi( this );    
+    m_ui.setupUi( this );
 
-    if( exportType )
+    if( shareOnInternet )
     {
         m_ui.outputLabel->setVisible( false );
         m_ui.outputFileName->setVisible( false );
diff --git a/src/Gui/export/RendererSettings.h b/src/Gui/export/RendererSettings.h
index 431c6fa..b6d84f7 100644
--- a/src/Gui/export/RendererSettings.h
+++ b/src/Gui/export/RendererSettings.h
@@ -44,7 +44,7 @@ class   RendererSettings : public QDialog
     };
 
     public:
-        RendererSettings( bool exportType = false );
+        RendererSettings( bool shareOnInternet = false );
 
         quint32         width() const;
         quint32         height() const;
diff --git a/src/Media/Media.cpp b/src/Media/Media.cpp
index 33ff213..b5f7414 100644
--- a/src/Media/Media.cpp
+++ b/src/Media/Media.cpp
@@ -36,7 +36,7 @@
 #include <QtDebug>
 #include <QUrl>
 
-const QString   Media::VideoExtensions = "*.3gp *.amv *.asf *.avi *.divx *.dv *.flv *.gxf "
+const QString   Media::VideoExtensions = "*.avi *.3gp *.amv *.asf *.divx *.dv *.flv *.gxf "
                                          "*.iso *.m1v *.m2v *.m2t *.m2ts *.m4v *.mkv *.mov "
                                          "*.mp2 *.mp4 *.mpeg *.mpeg1 *.mpeg2 *.mpeg4 *.mpg "
                                          "*.mts *.mxf *.nsv *.nuv *.ogg *.ogm *.ogv *.ogx *.ps "