Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
5d313c65
Commit
5d313c65
authored
Aug 01, 2008
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add m2ts and mts to the interface dialog selectors.
Synchronise supported extensions.
parent
1d9d6951
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
8 deletions
+19
-8
extras/package/win32/vlc.win32.nsi.in
extras/package/win32/vlc.win32.nsi.in
+12
-1
include/vlc_interface.h
include/vlc_interface.h
+2
-2
modules/gui/qt4/components/simple_preferences.cpp
modules/gui/qt4/components/simple_preferences.cpp
+5
-5
No files found.
extras/package/win32/vlc.win32.nsi.in
View file @
5d313c65
...
@@ -199,14 +199,20 @@ FunctionEnd
...
@@ -199,14 +199,20 @@ FunctionEnd
!insertmacro ${_action} ".ac3"
!insertmacro ${_action} ".ac3"
!insertmacro ${_action} ".dts"
!insertmacro ${_action} ".dts"
!insertmacro ${_action} ".flac"
!insertmacro ${_action} ".flac"
!insertmacro ${_action} ".m4a"
!insertmacro ${_action} ".m4p"
!insertmacro ${_action} ".mka"
!insertmacro ${_action} ".mka"
!insertmacro ${_action} ".mod"
!insertmacro ${_action} ".mp1"
!insertmacro ${_action} ".mp1"
!insertmacro ${_action} ".mp2"
!insertmacro ${_action} ".mp2"
!insertmacro ${_action} ".mp3"
!insertmacro ${_action} ".mp3"
!insertmacro ${_action} ".oma"
!insertmacro ${_action} ".ogg"
!insertmacro ${_action} ".ogg"
!insertmacro ${_action} ".spx"
!insertmacro ${_action} ".spx"
!insertmacro ${_action} ".wav"
!insertmacro ${_action} ".wav"
!insertmacro ${_action} ".wma"
!insertmacro ${_action} ".wma"
!insertmacro ${_action} ".wma"
!insertmacro ${_action} ".xm"
!macroend
!macroend
!macro MacroVideoExtensions _action
!macro MacroVideoExtensions _action
...
@@ -214,8 +220,12 @@ FunctionEnd
...
@@ -214,8 +220,12 @@ FunctionEnd
!insertmacro ${_action} ".avi"
!insertmacro ${_action} ".avi"
!insertmacro ${_action} ".divx"
!insertmacro ${_action} ".divx"
!insertmacro ${_action} ".dv"
!insertmacro ${_action} ".dv"
!insertmacro ${_action} ".flv"
!insertmacro ${_action} ".gxf"
!insertmacro ${_action} ".m1v"
!insertmacro ${_action} ".m1v"
!insertmacro ${_action} ".m2v"
!insertmacro ${_action} ".m2v"
!insertmacro ${_action} ".m2ts"
!insertmacro ${_action} ".m4v"
!insertmacro ${_action} ".mkv"
!insertmacro ${_action} ".mkv"
!insertmacro ${_action} ".mov"
!insertmacro ${_action} ".mov"
!insertmacro ${_action} ".mp4"
!insertmacro ${_action} ".mp4"
...
@@ -224,10 +234,11 @@ FunctionEnd
...
@@ -224,10 +234,11 @@ FunctionEnd
!insertmacro ${_action} ".mpeg2"
!insertmacro ${_action} ".mpeg2"
!insertmacro ${_action} ".mpeg4"
!insertmacro ${_action} ".mpeg4"
!insertmacro ${_action} ".mpg"
!insertmacro ${_action} ".mpg"
!insertmacro ${_action} ".mts"
!insertmacro ${_action} ".mxf"
!insertmacro ${_action} ".mxf"
!insertmacro ${_action} ".ogm"
!insertmacro ${_action} ".ps"
!insertmacro ${_action} ".ps"
!insertmacro ${_action} ".ts"
!insertmacro ${_action} ".ts"
!insertmacro ${_action} ".ogm"
!insertmacro ${_action} ".vob"
!insertmacro ${_action} ".vob"
!insertmacro ${_action} ".wmv"
!insertmacro ${_action} ".wmv"
!macroend
!macroend
...
...
include/vlc_interface.h
View file @
5d313c65
...
@@ -183,8 +183,8 @@ typedef enum vlc_dialog {
...
@@ -183,8 +183,8 @@ typedef enum vlc_dialog {
"*.wav;*.wma;*.xm"
"*.wav;*.wma;*.xm"
#define EXTENSIONS_VIDEO "*.asf;*.avi;*.divx;*.dv;*.flv;*.gxf;*.m1v;*.m2v;" \
#define EXTENSIONS_VIDEO "*.asf;*.avi;*.divx;*.dv;*.flv;*.gxf;*.m1v;*.m2v;" \
"*.m4v;*.mkv;*.mov;*.mp2;*.mp4;*.mpeg;*.mpeg1;" \
"*.m
2ts;*.m
4v;*.mkv;*.mov;*.mp2;*.mp4;*.mpeg;*.mpeg1;" \
"*.mpeg2;*.mpeg4;*.mpg;*.mxf;*.ogg;*.ogm;" \
"*.mpeg2;*.mpeg4;*.mpg;*.m
ts;*.m
xf;*.ogg;*.ogm;" \
"*.ps;*.ts;*.vob;*.wmv"
"*.ps;*.ts;*.vob;*.wmv"
#define EXTENSIONS_PLAYLIST "*.asx;*.b4s;*.m3u;*.pls;*.vlc;*.xspf"
#define EXTENSIONS_PLAYLIST "*.asx;*.b4s;*.m3u;*.pls;*.vlc;*.xspf"
...
...
modules/gui/qt4/components/simple_preferences.cpp
View file @
5d313c65
...
@@ -774,8 +774,8 @@ void SPrefsPanel::assoDialog()
...
@@ -774,8 +774,8 @@ void SPrefsPanel::assoDialog()
aTa
(
".a52"
);
aTa
(
".aac"
);
aTa
(
".ac3"
);
aTa
(
".dts"
);
aTa
(
".flac"
);
aTa
(
".a52"
);
aTa
(
".aac"
);
aTa
(
".ac3"
);
aTa
(
".dts"
);
aTa
(
".flac"
);
aTa
(
".m4a"
);
aTa
(
".m4p"
);
aTa
(
".mka"
);
aTa
(
".mod"
);
aTa
(
".mp1"
);
aTa
(
".m4a"
);
aTa
(
".m4p"
);
aTa
(
".mka"
);
aTa
(
".mod"
);
aTa
(
".mp1"
);
aTa
(
".mp2"
);
aTa
(
".mp3"
);
aTa
(
".o
gg"
);
aTa
(
".spx"
);
aTa
(
".wav
"
);
aTa
(
".mp2"
);
aTa
(
".mp3"
);
aTa
(
".o
ma"
);
aTa
(
".ogg"
);
aTa
(
".spx
"
);
aTa
(
".wma"
);
aTa
(
".xm"
);
aTa
(
".w
av"
);
aTa
(
".w
ma"
);
aTa
(
".xm"
);
audioType
->
setCheckState
(
0
,
(
i_temp
>
0
)
?
audioType
->
setCheckState
(
0
,
(
i_temp
>
0
)
?
(
(
i_temp
==
audioType
->
childCount
()
)
?
(
(
i_temp
==
audioType
->
childCount
()
)
?
Qt
::
Checked
:
Qt
::
PartiallyChecked
)
Qt
::
Checked
:
Qt
::
PartiallyChecked
)
...
@@ -783,10 +783,10 @@ void SPrefsPanel::assoDialog()
...
@@ -783,10 +783,10 @@ void SPrefsPanel::assoDialog()
i_temp
=
0
;
i_temp
=
0
;
aTv
(
".asf"
);
aTv
(
".avi"
);
aTv
(
".divx"
);
aTv
(
".dv"
);
aTv
(
".flv"
);
aTv
(
".asf"
);
aTv
(
".avi"
);
aTv
(
".divx"
);
aTv
(
".dv"
);
aTv
(
".flv"
);
aTv
(
".gxf"
);
aTv
(
".m1v"
);
aTv
(
".m2v"
);
aTv
(
".m
4v"
);
aTv
(
".mk
v"
);
aTv
(
".gxf"
);
aTv
(
".m1v"
);
aTv
(
".m2v"
);
aTv
(
".m
2ts"
);
aTv
(
".m4
v"
);
aTv
(
".mov"
);
aTv
(
".mp2"
);
aTv
(
".mp4"
);
aTv
(
".mpeg"
);
aTv
(
".m
kv"
);
aTv
(
".m
ov"
);
aTv
(
".mp2"
);
aTv
(
".mp4"
);
aTv
(
".mpeg"
);
aTv
(
".mpeg1"
);
aTv
(
".mpeg2"
);
aTv
(
".mpeg4"
);
aTv
(
".mpg"
);
aTv
(
".mpeg1"
);
aTv
(
".mpeg2"
);
aTv
(
".mpeg4"
);
aTv
(
".mpg"
);
aTv
(
".mxf"
);
aTv
(
".ogm"
);
aTv
(
".ps"
);
aTv
(
".ts"
);
aTv
(
".m
ts"
);
aTv
(
".m
xf"
);
aTv
(
".ogm"
);
aTv
(
".ps"
);
aTv
(
".ts"
);
aTv
(
".vob"
);
aTv
(
".wmv"
);
aTv
(
".vob"
);
aTv
(
".wmv"
);
videoType
->
setCheckState
(
0
,
(
i_temp
>
0
)
?
videoType
->
setCheckState
(
0
,
(
i_temp
>
0
)
?
(
(
i_temp
==
audioType
->
childCount
()
)
?
(
(
i_temp
==
audioType
->
childCount
()
)
?
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment