From 6e59bfe80fbbe314625d54ab74a4f7edbb28aef4 Mon Sep 17 00:00:00 2001 From: Erwan Tulou Date: Fri, 30 Jul 2010 11:24:19 +0200 Subject: [PATCH] skins2: translate $F into local path instead of uri when possible Local paths are more user-friendly for display than full uri when that makes sense --- modules/gui/skins2/src/vlcproc.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/gui/skins2/src/vlcproc.cpp b/modules/gui/skins2/src/vlcproc.cpp index a0a0e34f1b..13beffaf3a 100644 --- a/modules/gui/skins2/src/vlcproc.cpp +++ b/modules/gui/skins2/src/vlcproc.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include "vlcproc.hpp" #include "os_factory.hpp" @@ -476,9 +477,12 @@ void VlcProc::on_item_current_changed( vlc_object_t* p_obj, vlc_value_t newVal ) SET_TEXT( m_cVarStreamName, UString( getIntf(), psz_name ) ); free( psz_name ); - // Update full uri + // Update local path (if possible) or full uri char *psz_uri = input_item_GetURI( p_item ); - SET_TEXT( m_cVarStreamURI, UString( getIntf(), psz_uri ) ); + char *psz_path = make_path( psz_uri ); + char *psz_save = psz_path ? psz_path : psz_uri; + SET_TEXT( m_cVarStreamURI, UString( getIntf(), psz_save ) ); + free( psz_path ); free( psz_uri ); // Update art uri -- 2.39.2