Commit cfe22e54 authored by Olivier Teulière's avatar Olivier Teulière

* skins2: expect the .wsz extension for winamp2 skins, instead of .zip

parent 55e26be2
...@@ -221,7 +221,7 @@ void Dialogs::showFileGeneric( const string &rTitle, const string &rExtensions, ...@@ -221,7 +221,7 @@ void Dialogs::showFileGeneric( const string &rTitle, const string &rExtensions,
void Dialogs::showChangeSkin() void Dialogs::showChangeSkin()
{ {
showFileGeneric( _("Open a skin file"), 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 ); showChangeSkinCB, kOPEN );
} }
......
...@@ -277,10 +277,10 @@ static int DemuxOpen( vlc_object_t *p_this ) ...@@ -277,10 +277,10 @@ static int DemuxOpen( vlc_object_t *p_this )
p_demux->pf_demux = Demux; p_demux->pf_demux = Demux;
p_demux->pf_control = DemuxControl; 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... // TODO: an actual check of the contents would be better...
if( ( ext = strchr( p_demux->psz_path, '.' ) ) == NULL || if( ( ext = strchr( p_demux->psz_path, '.' ) ) == NULL ||
strcasecmp( ext, ".vlt" ) ) ( strcasecmp( ext, ".vlt" ) && strcasecmp( ext, ".wsz" ) ) )
{ {
return VLC_EGENERIC; return VLC_EGENERIC;
} }
......
...@@ -125,7 +125,7 @@ void ThemeRepository::parseDirectory( const string &rDir ) ...@@ -125,7 +125,7 @@ void ThemeRepository::parseDirectory( const string &rDir )
{ {
extension = name.substr( name.size() - 4, 4 ); extension = name.substr( name.size() - 4, 4 );
} }
if( extension == ".vlt" || extension == ".zip" ) if( extension == ".vlt" || extension == ".wsz" )
{ {
string path = rDir + sep + name; string path = rDir + sep + name;
msg_Dbg( getIntf(), "found skin %s", path.c_str() ); msg_Dbg( getIntf(), "found skin %s", path.c_str() );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment