Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
cfe22e54
Commit
cfe22e54
authored
Nov 08, 2005
by
Olivier Teulière
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* skins2: expect the .wsz extension for winamp2 skins, instead of .zip
parent
55e26be2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
modules/gui/skins2/src/dialogs.cpp
modules/gui/skins2/src/dialogs.cpp
+1
-1
modules/gui/skins2/src/skin_main.cpp
modules/gui/skins2/src/skin_main.cpp
+2
-2
modules/gui/skins2/src/theme_repository.cpp
modules/gui/skins2/src/theme_repository.cpp
+1
-1
No files found.
modules/gui/skins2/src/dialogs.cpp
View file @
cfe22e54
...
...
@@ -221,7 +221,7 @@ void Dialogs::showFileGeneric( const string &rTitle, const string &rExtensions,
void
Dialogs
::
showChangeSkin
()
{
showFileGeneric
(
_
(
"Open a skin file"
),
_
(
"Skin files (*.vlt;*.
zip)|*.vlt;*.zip
|Skin files (*.xml)|*.xml"
),
_
(
"Skin files (*.vlt;*.
wsz)|*.vlt;*.wsz
|Skin files (*.xml)|*.xml"
),
showChangeSkinCB
,
kOPEN
);
}
...
...
modules/gui/skins2/src/skin_main.cpp
View file @
cfe22e54
...
...
@@ -277,10 +277,10 @@ static int DemuxOpen( vlc_object_t *p_this )
p_demux
->
pf_demux
=
Demux
;
p_demux
->
pf_control
=
DemuxControl
;
// Test that we have a valid .vlt file, based on the extension
// Test that we have a valid .vlt
or .wsz
file, based on the extension
// TODO: an actual check of the contents would be better...
if
(
(
ext
=
strchr
(
p_demux
->
psz_path
,
'.'
)
)
==
NULL
||
strcasecmp
(
ext
,
".vlt"
)
)
(
strcasecmp
(
ext
,
".vlt"
)
&&
strcasecmp
(
ext
,
".wsz"
)
)
)
{
return
VLC_EGENERIC
;
}
...
...
modules/gui/skins2/src/theme_repository.cpp
View file @
cfe22e54
...
...
@@ -125,7 +125,7 @@ void ThemeRepository::parseDirectory( const string &rDir )
{
extension
=
name
.
substr
(
name
.
size
()
-
4
,
4
);
}
if
(
extension
==
".vlt"
||
extension
==
".
zip
"
)
if
(
extension
==
".vlt"
||
extension
==
".
wsz
"
)
{
string
path
=
rDir
+
sep
+
name
;
msg_Dbg
(
getIntf
(),
"found skin %s"
,
path
.
c_str
()
);
...
...
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