From 16f240f8a6648f7f4d8f8731325ab55958a26920 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Fri, 12 Sep 2008 14:14:57 -0700 Subject: [PATCH] Ogg extensions update as RFC 5334 recommends. Ogg can be now: ogx, ogv, oga but we have to keep ogg and ogm for backward compatibility. --- extras/package/win32/vlc.win32.nsi.in | 5 ++++- include/vlc_interface.h | 5 +++-- modules/gui/qt4/components/simple_preferences.cpp | 5 +++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/extras/package/win32/vlc.win32.nsi.in b/extras/package/win32/vlc.win32.nsi.in index 6c521cb091..9d3128c1f2 100644 --- a/extras/package/win32/vlc.win32.nsi.in +++ b/extras/package/win32/vlc.win32.nsi.in @@ -210,7 +210,7 @@ FunctionEnd !insertmacro ${_action} ".mp2" !insertmacro ${_action} ".mp3" !insertmacro ${_action} ".oma" - !insertmacro ${_action} ".ogg" + !insertmacro ${_action} ".oga" !insertmacro ${_action} ".spx" !insertmacro ${_action} ".wav" !insertmacro ${_action} ".wma" @@ -239,7 +239,10 @@ FunctionEnd !insertmacro ${_action} ".mpg" !insertmacro ${_action} ".mts" !insertmacro ${_action} ".mxf" + !insertmacro ${_action} ".ogg" !insertmacro ${_action} ".ogm" + !insertmacro ${_action} ".ogx" + !insertmacro ${_action} ".ogv" !insertmacro ${_action} ".ts" !insertmacro ${_action} ".vob" !insertmacro ${_action} ".wmv" diff --git a/include/vlc_interface.h b/include/vlc_interface.h index ef35a07934..1c028b7420 100644 --- a/include/vlc_interface.h +++ b/include/vlc_interface.h @@ -176,12 +176,13 @@ typedef enum vlc_dialog { #define INTF_ABOUT_MSG LICENSE_MSG #define EXTENSIONS_AUDIO "*.a52;*.aac;*.ac3;*.dts;*.flac;*.m4a;*.m4p;*.mka;" \ - "*.mod;*.mp1;*.mp2;*.mp3;*.ogg;*.oma;*.spx;" \ + "*.mod;*.mp1;*.mp2;*.mp3;*.oga;*.ogg;*.oma;*.spx;" \ "*.wav;*.wma;*.xm" #define EXTENSIONS_VIDEO "*.asf;*.avi;*.divx;*.dv;*.flv;*.gxf;*.m1v;*.m2v;" \ "*.m2ts;*.m4v;*.mkv;*.mov;*.mp2;*.mp4;*.mpeg;*.mpeg1;" \ - "*.mpeg2;*.mpeg4;*.mpg;*.mts;*.mxf;*.ogg;*.ogm;" \ + "*.mpeg2;*.mpeg4;*.mpg;*.mts;*.mxf;" \ + "*.ogg;*.ogm;*.ogv;*.ogx;" \ "*.ps;*.ts;*.vob;*.wmv" #define EXTENSIONS_PLAYLIST "*.asx;*.b4s;*.m3u;*.pls;*.vlc;*.xspf" diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index 87076b72dc..e7c9e10781 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -773,7 +773,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( ".ogg" ); aTa( ".spx" ); + aTa( ".mp2" ); aTa( ".mp3" ); aTa( ".oma" ); aTa( ".oga" ); aTa( ".spx" ); aTa( ".wav" ); aTa( ".wma" ); aTa( ".xm" ); audioType->setCheckState( 0, ( i_temp > 0 ) ? ( ( i_temp == audioType->childCount() ) ? @@ -785,7 +785,8 @@ void SPrefsPanel::assoDialog() aTv( ".gxf" ); aTv( ".m1v" ); aTv( ".m2v" ); aTv( ".m2ts" ); aTv( ".m4v" ); aTv( ".mkv" ); aTv( ".mov" ); aTv( ".mp2" ); aTv( ".mp4" ); aTv( ".mpeg" ); aTv( ".mpeg1" ); aTv( ".mpeg2" ); aTv( ".mpeg4" ); aTv( ".mpg" ); - aTv( ".mts" ); aTv( ".mxf" ); aTv( ".ogm" ); aTv( ".ts" ); + aTv( ".mts" ); aTv( ".mxf" ); + aTv( ".ogg" ); aTv( ".ogm" ); aTv( ".ogx" ); aTv( ".ogv" ); aTv( ".ts" ); aTv( ".vob" ); aTv( ".wmv" ); videoType->setCheckState( 0, ( i_temp > 0 ) ? ( ( i_temp == audioType->childCount() ) ? -- 2.39.2