From: Marian Ďurkovič Date: Wed, 21 Oct 2009 08:35:35 +0000 (+0200) Subject: Add .ifo to recognized extensions X-Git-Tag: 1.1.0-ff~2743 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=80f9f8734a9e5d1fb68ee1e2102aecfbf91c613a;p=vlc Add .ifo to recognized extensions --- diff --git a/extras/package/win32/vlc.win32.nsi.in b/extras/package/win32/vlc.win32.nsi.in index 435e14d970..70b2dae9f9 100644 --- a/extras/package/win32/vlc.win32.nsi.in +++ b/extras/package/win32/vlc.win32.nsi.in @@ -260,6 +260,7 @@ FunctionEnd !insertmacro ${_action} ".asx" !insertmacro ${_action} ".bin" !insertmacro ${_action} ".cue" + !insertmacro ${_action} ".ifo" !insertmacro ${_action} ".m3u" !insertmacro ${_action} ".pls" !insertmacro ${_action} ".vlc" diff --git a/include/vlc_interface.h b/include/vlc_interface.h index b525a1bd5d..6f0514953d 100644 --- a/include/vlc_interface.h +++ b/include/vlc_interface.h @@ -179,7 +179,7 @@ typedef enum vlc_dialog { "*.ogg;*.ogm;*.ogv;*.ogx;*.ps;" \ "*.rec;*.rm;*.rmvb;*.tod;*.ts;*.vob;*.wmv" -#define EXTENSIONS_PLAYLIST "*.asx;*.b4s;*.m3u;*.pls;*.ram;*.rar;*.vlc;*.xspf;*.zip" +#define EXTENSIONS_PLAYLIST "*.asx;*.b4s;*.ifo;*.m3u;*.pls;*.ram;*.rar;*.vlc;*.xspf;*.zip" #define EXTENSIONS_MEDIA EXTENSIONS_VIDEO ";" EXTENSIONS_AUDIO ";" \ EXTENSIONS_PLAYLIST diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index f44f29df98..cc0363a6cd 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -931,7 +931,7 @@ void SPrefsPanel::assoDialog() : Qt::Unchecked ); i_temp = 0; - aTo( ".asx" ); aTo( ".b4s" ); aTo( ".m3u" ); aTo( ".pls" ); aTo( ".vlc" ); + aTo( ".asx" ); aTo( ".b4s" ); aTo( ".ifo" ); aTo( ".m3u" ); aTo( ".pls" ); aTo( ".vlc" ); aTo( ".xspf" ); otherType->setCheckState( 0, ( i_temp > 0 ) ? ( ( i_temp == audioType->childCount() ) ?