[vlmc-devel] commit: Media: All the extensions handled by vlc are now handled by vlmc. ( Hugo Beauzée-Luyssen )

[git at videolan.org]

vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Thu Jul  8 14:05:07 2010 +0200| [1d8566a378d41977bf22807745d60f3609a03b9c] | committer: Hugo Beauzée-Luyssen 

Media: All the extensions handled by vlc are now handled by vlmc.

These extensions are also used when filtering file type in the render
window.
Fixes #121

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

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

diff --git a/src/Gui/export/RendererSettings.cpp b/src/Gui/export/RendererSettings.cpp
index d1f39ff..fc335cd 100644
--- a/src/Gui/export/RendererSettings.cpp
+++ b/src/Gui/export/RendererSettings.cpp
@@ -21,6 +21,8 @@
  *****************************************************************************/
 
 #include "RendererSettings.h"
+
+#include "Media.h"
 #include "SettingsManager.h"
 
 #include "ui_RendererSettings.h"
@@ -51,7 +53,7 @@ RendererSettings::selectOutputFileName()
 {
     QString outputFileName =
             QFileDialog::getSaveFileName( NULL, tr ( "Enter the output file name" ),
-                                          QDir::currentPath(), tr( "Videos(*.avi *.mpg)" ) );
+                                          QDir::currentPath(), tr( "Videos(%1)" ).arg( Media::VideoExtensions ) );
     m_ui.outputFileName->setText( outputFileName );
 }
 
diff --git a/src/Media/Media.cpp b/src/Media/Media.cpp
index 9eaf446..f225fd3 100644
--- a/src/Media/Media.cpp
+++ b/src/Media/Media.cpp
@@ -36,10 +36,19 @@
 #include <QtDebug>
 #include <QUrl>
 
-const QString   Media::VideoExtensions = "*.mov *.avi *.mkv *.mpg *.mpeg *.wmv *.mp4 "
-                                         "*.ogg *.ogv *.dv *.ts *.m2v *.ps";
+const QString   Media::VideoExtensions = "*.3gp *.amv *.asf *.avi *.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 "
+                                         "*.rec *.rm *.rmvb *.tod *.ts *.vob *.vro *.webm *.wmv";
+
 const QString   Media::ImageExtensions = "*.gif *.png *.jpg *.jpeg";
-const QString   Media::AudioExtensions = "*.mp3 *.oga *.flac *.aac *.wav";
+
+const QString   Media::AudioExtensions = "*.a52 *.aac *.ac3 *.aiff *.amr *.aob *.ape "
+                                         "*.dts *.flac *.it *.m4a *.m4p *.mid *.mka *.mlp "
+                                         "*.mod *.mp1 *.mp2 *.mp3 *.mpc *.oga *.ogg *.oma "
+                                         "*.rmi *.s3m *.spx *.tta *.voc *.vqf *.w64 *.wav "
+                                         "*.wma *.wv *.xa *.xm";
 const QString   Media::streamPrefix = "stream://";
 
 Media::Media( const QString& filePath )