[vlc-devel] commit: Add .ifo to recognized extensions ( Marian Ďurkovič )
git version control
git at videolan.org
Wed Oct 21 10:48:54 CEST 2009
vlc | branch: 1.0-bugfix | Marian Ďurkovič <md at bts.sk> | Wed Oct 21 10:35:35 2009 +0200| [40fca422cab08ad06a62ff448698d13259b3cc11] | committer: Marian Ďurkovič
Add .ifo to recognized extensions
backport of 80f9f8734a9e5d1fb68ee1e2102aecfbf91c613a
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=40fca422cab08ad06a62ff448698d13259b3cc11
---
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 e1925a8..0fb7465 100644
--- a/extras/package/win32/vlc.win32.nsi.in
+++ b/extras/package/win32/vlc.win32.nsi.in
@@ -261,6 +261,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 a135be3..3b61d0a 100644
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -177,7 +177,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;*.vlc;*.xspf"
+#define EXTENSIONS_PLAYLIST "*.asx;*.b4s;*.ifo;*.m3u;*.pls;*.ram;*.vlc;*.xspf"
#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 4a3b369..7e7cd39 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -830,7 +830,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() ) ?
More information about the vlc-devel
mailing list