From 2b517dc714c02f654d032e9d68815281a613cafa Mon Sep 17 00:00:00 2001 From: ulion Date: Wed, 26 Dec 2007 04:15:56 +0000 Subject: Support ?(!NAME:TEXT) format for expanding string by property. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25529 b3059339-0415-0410-9bf9-f77b7e298cf2 --- m_property.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'm_property.c') diff --git a/m_property.c b/m_property.c index 2b9b04d4d7..d5e40bcd6c 100644 --- a/m_property.c +++ b/m_property.c @@ -146,11 +146,16 @@ char* m_properties_expand_string(m_option_t* prop_list,char* str, void *ctx) { } else if(str[0] == '?' && str[1] == '(' && (e = strchr(str+2,':'))) { lvl++; if(!skip) { - int pl = e-str-2; + int is_not = str[2] == '!'; + int pl = e - str - (is_not ? 3 : 2); char pname[pl+1]; - memcpy(pname,str+2,pl); + memcpy(pname, str + (is_not ? 3 : 2), pl); pname[pl] = 0; - if(m_property_do(prop_list,pname,M_PROPERTY_GET,NULL,ctx) < 0) + if(m_property_do(prop_list,pname,M_PROPERTY_GET,NULL,ctx) < 0) { + if (!is_not) + skip = 1, skip_lvl = lvl; + } + else if (is_not) skip = 1, skip_lvl = lvl; } str = e+1, l = 0; -- cgit v1.2.3