[vlc-commits] commit: Files and paths are not string variables (for Qt) ( Francois Cartegnie )

[git at videolan.org]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Dec 21 19:51:10 2010 +0100| [b74d2d8c4f12f3e4cd6a8f0fd2af76dc77f00bc8] | committer: Francois Cartegnie 

Files and paths are not string variables (for Qt)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b74d2d8c4f12f3e4cd6a8f0fd2af76dc77f00bc8
---

 modules/access/dvb/access.c      |    8 ++++----
 modules/access_output/http.c     |    8 ++++----
 modules/control/http/http.c      |    8 ++++----
 modules/video_filter/alphamask.c |    2 +-
 modules/video_filter/osdmenu.c   |    4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c
index e676d05..4cdfbf6 100644
--- a/modules/access/dvb/access.c
+++ b/modules/access/dvb/access.c
@@ -262,13 +262,13 @@ vlc_module_begin ()
                   PASSWORD_LONGTEXT, true )
     add_string( "dvb-http-acl", NULL, ACL_TEXT, ACL_LONGTEXT,
                 true )
-    add_string( "dvb-http-intf-cert", NULL, CERT_TEXT, CERT_LONGTEXT,
+    add_loadfile( "dvb-http-intf-cert", NULL, CERT_TEXT, CERT_LONGTEXT,
                 true )
-    add_string( "dvb-http-intf-key",  NULL, KEY_TEXT,  KEY_LONGTEXT,
+    add_loadfile( "dvb-http-intf-key",  NULL, KEY_TEXT,  KEY_LONGTEXT,
                 true )
-    add_string( "dvb-http-intf-ca",   NULL, CA_TEXT,   CA_LONGTEXT,
+    add_loadfile( "dvb-http-intf-ca",   NULL, CA_TEXT,   CA_LONGTEXT,
                 true )
-    add_string( "dvb-http-intf-crl",  NULL, CRL_TEXT,  CRL_LONGTEXT,
+    add_loadfile( "dvb-http-intf-crl",  NULL, CRL_TEXT,  CRL_LONGTEXT,
                 true )
 #endif
 
diff --git a/modules/access_output/http.c b/modules/access_output/http.c
index d1ec16e..b1f85f5 100644
--- a/modules/access_output/http.c
+++ b/modules/access_output/http.c
@@ -104,13 +104,13 @@ vlc_module_begin ()
                   PASS_TEXT, PASS_LONGTEXT, true )
     add_string( SOUT_CFG_PREFIX "mime", "",
                 MIME_TEXT, MIME_LONGTEXT, true )
-    add_string( SOUT_CFG_PREFIX "cert", "vlc.pem",
+    add_loadfile( SOUT_CFG_PREFIX "cert", "vlc.pem",
                 CERT_TEXT, CERT_LONGTEXT, true )
-    add_string( SOUT_CFG_PREFIX "key", NULL,
+    add_loadfile( SOUT_CFG_PREFIX "key", NULL,
                 KEY_TEXT, KEY_LONGTEXT, true )
-    add_string( SOUT_CFG_PREFIX "ca", NULL,
+    add_loadfile( SOUT_CFG_PREFIX "ca", NULL,
                 CA_TEXT, CA_LONGTEXT, true )
-    add_string( SOUT_CFG_PREFIX "crl", NULL,
+    add_loadfile( SOUT_CFG_PREFIX "crl", NULL,
                 CRL_TEXT, CRL_LONGTEXT, true )
 #if 0 //def HAVE_AVAHI_CLIENT
     add_bool( SOUT_CFG_PREFIX "bonjour", false,
diff --git a/modules/control/http/http.c b/modules/control/http/http.c
index 66a3826..bc087a5 100644
--- a/modules/control/http/http.c
+++ b/modules/control/http/http.c
@@ -78,10 +78,10 @@ vlc_module_begin ()
 #endif
         add_bool   ( "http-album-art", false, ART_TEXT, ART_LONGTEXT, true )
         set_section( N_("HTTP SSL" ), 0 )
-        add_string ( "http-intf-cert", NULL, CERT_TEXT, CERT_LONGTEXT, true )
-        add_string ( "http-intf-key",  NULL, KEY_TEXT,  KEY_LONGTEXT,  true )
-        add_string ( "http-intf-ca",   NULL, CA_TEXT,   CA_LONGTEXT,   true )
-        add_string ( "http-intf-crl",  NULL, CRL_TEXT,  CRL_LONGTEXT,  true )
+        add_loadfile ( "http-intf-cert", NULL, CERT_TEXT, CERT_LONGTEXT, true )
+        add_loadfile ( "http-intf-key",  NULL, KEY_TEXT,  KEY_LONGTEXT,  true )
+        add_loadfile ( "http-intf-ca",   NULL, CA_TEXT,   CA_LONGTEXT,   true )
+        add_loadfile ( "http-intf-crl",  NULL, CRL_TEXT,  CRL_LONGTEXT,  true )
     set_capability( "interface", 0 )
     set_callbacks( Open, Close )
     add_shortcut( "http" )
diff --git a/modules/video_filter/alphamask.c b/modules/video_filter/alphamask.c
index 70914d1..bda9fbe 100644
--- a/modules/video_filter/alphamask.c
+++ b/modules/video_filter/alphamask.c
@@ -69,7 +69,7 @@ vlc_module_begin ()
     add_shortcut( "alphamask", "mask" )
     set_callbacks( Create, Destroy )
 
-    add_string( CFG_PREFIX "mask", NULL, MASK_TEXT,
+    add_loadfile( CFG_PREFIX "mask", NULL, MASK_TEXT,
                 MASK_LONGTEXT, false )
 vlc_module_end ()
 
diff --git a/modules/video_filter/osdmenu.c b/modules/video_filter/osdmenu.c
index 0400813..9ca59a6 100644
--- a/modules/video_filter/osdmenu.c
+++ b/modules/video_filter/osdmenu.c
@@ -129,9 +129,9 @@ vlc_module_begin ()
     add_integer( OSD_CFG "position", 8, POS_TEXT, POS_LONGTEXT,
                  false )
         change_integer_list( pi_pos_values, ppsz_pos_descriptions )
-    add_string( OSD_CFG "file", OSD_DEFAULT_CFG, OSD_FILE_TEXT,
+    add_loadfile( OSD_CFG "file", OSD_DEFAULT_CFG, OSD_FILE_TEXT,
         OSD_FILE_LONGTEXT, false )
-    add_string( OSD_CFG "file-path", NULL, OSD_PATH_TEXT,
+    add_directory( OSD_CFG "file-path", NULL, OSD_PATH_TEXT,
         OSD_PATH_LONGTEXT, false )
     add_integer( OSD_CFG "timeout", 15, TIMEOUT_TEXT,
         TIMEOUT_LONGTEXT, false )