[vlc-devel] commit: Integrate .tta in interface and installer (Jean-Baptiste Kempf )

git version control git at videolan.org
Thu Jan 14 01:41:56 CET 2010


vlc-1.0-bugfix | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Jan 14 01:38:32 2010 +0100| [826ddbe410aafb8ef0a674ea0b93f02e2c77fe73] | committer: Jean-Baptiste Kempf 

Integrate .tta in interface and installer

> http://git.videolan.org/gitweb.cgi/vlc-1.0-bugfix.git/?a=commit;h=826ddbe410aafb8ef0a674ea0b93f02e2c77fe73
---

 extras/package/win32/vlc.win32.nsi.in             |    1 +
 include/vlc_interface.h                           |    2 +-
 modules/gui/qt4/components/simple_preferences.cpp |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/extras/package/win32/vlc.win32.nsi.in b/extras/package/win32/vlc.win32.nsi.in
index fad91ea..8496c90 100644
--- a/extras/package/win32/vlc.win32.nsi.in
+++ b/extras/package/win32/vlc.win32.nsi.in
@@ -219,6 +219,7 @@ FunctionEnd
   !insertmacro ${_action} ".oma"
   !insertmacro ${_action} ".oga"
   !insertmacro ${_action} ".spx"
+  !insertmacro ${_action} ".tta"
   !insertmacro ${_action} ".wav"
   !insertmacro ${_action} ".wma"
   !insertmacro ${_action} ".wv"
diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index 8550c63..22563be 100644
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -168,7 +168,7 @@ typedef enum vlc_dialog {
 
 #define EXTENSIONS_AUDIO "*.a52;*.aac;*.ac3;*.ape;*.dts;*.flac;*.it;" \
                          "*.m4a;*.m4p;*.mka;*.mlp;*.mod;*.mp1;*.mp2;*.mp3;" \
-                         "*.oga;*.ogg;*.oma;*.s3m;*.spx;" \
+                         "*.oga;*.ogg;*.oma;*.s3m;*.spx;*.tta;" \
                          "*.wav;*.wma;*.wv;*.xm"
 
 #define EXTENSIONS_VIDEO "*.asf;*.avi;*.divx;*.dv;*.flv;*.gxf;*.iso;*.m1v;*.m2v;" \
diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index c41e33b..b17efcd 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -810,7 +810,7 @@ void SPrefsPanel::assoDialog()
     aTa( ".a52" ); aTa( ".aac" ); aTa( ".ac3" ); aTa( ".dts" ); aTa( ".flac" );
     aTa( ".m4a" ); aTa( ".m4p" ); aTa( ".mka" ); aTa( ".mod" ); aTa( ".mp1" );
     aTa( ".mp2" ); aTa( ".mp3" ); aTa( ".oma" ); aTa( ".oga" ); aTa( ".spx" );
-    aTa( ".wav" ); aTa( ".wma" ); aTa( ".xm" );
+    aTA( ".tta" ); aTa( ".wav" ); aTa( ".wma" ); aTa( ".xm" );
     audioType->setCheckState( 0, ( i_temp > 0 ) ?
                               ( ( i_temp == audioType->childCount() ) ?
                                Qt::Checked : Qt::PartiallyChecked )




More information about the vlc-devel mailing list