Commit 2e6858af authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

add_password: remove callback parameter

parent 981a8542
...@@ -303,7 +303,7 @@ enum vlc_module_properties ...@@ -303,7 +303,7 @@ enum vlc_module_properties
add_string_inner( CONFIG_ITEM_STRING, name, text, longtext, advc, \ add_string_inner( CONFIG_ITEM_STRING, name, text, longtext, advc, \
value ) value )
#define add_password( name, value, p_callback, text, longtext, advc ) \ #define add_password( name, value, text, longtext, advc ) \
add_string_inner( CONFIG_ITEM_PASSWORD, name, text, longtext, advc, \ add_string_inner( CONFIG_ITEM_PASSWORD, name, text, longtext, advc, \
value ) value )
......
...@@ -258,7 +258,7 @@ vlc_module_begin () ...@@ -258,7 +258,7 @@ vlc_module_begin ()
true ) true )
add_string( "dvb-http-user", NULL, USER_TEXT, USER_LONGTEXT, add_string( "dvb-http-user", NULL, USER_TEXT, USER_LONGTEXT,
true ) true )
add_password( "dvb-http-password", NULL, NULL, PASSWORD_TEXT, add_password( "dvb-http-password", NULL, PASSWORD_TEXT,
PASSWORD_LONGTEXT, true ) PASSWORD_LONGTEXT, true )
add_string( "dvb-http-acl", NULL, ACL_TEXT, ACL_LONGTEXT, add_string( "dvb-http-acl", NULL, ACL_TEXT, ACL_LONGTEXT,
true ) true )
......
...@@ -114,7 +114,7 @@ vlc_module_begin () ...@@ -114,7 +114,7 @@ vlc_module_begin ()
add_string( "http-proxy", NULL, PROXY_TEXT, PROXY_LONGTEXT, add_string( "http-proxy", NULL, PROXY_TEXT, PROXY_LONGTEXT,
false ) false )
add_password( "http-proxy-pwd", NULL, NULL, add_password( "http-proxy-pwd", NULL,
PROXY_PASS_TEXT, PROXY_PASS_LONGTEXT, false ) PROXY_PASS_TEXT, PROXY_PASS_LONGTEXT, false )
add_integer( "http-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL, add_integer( "http-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL,
CACHING_TEXT, CACHING_LONGTEXT, true ) CACHING_TEXT, CACHING_LONGTEXT, true )
......
...@@ -85,7 +85,7 @@ vlc_module_begin () ...@@ -85,7 +85,7 @@ vlc_module_begin ()
change_safe() change_safe()
add_string( "smb-user", NULL, USER_TEXT, USER_LONGTEXT, add_string( "smb-user", NULL, USER_TEXT, USER_LONGTEXT,
false ) false )
add_password( "smb-pwd", NULL, NULL, PASS_TEXT, add_password( "smb-pwd", NULL, PASS_TEXT,
PASS_LONGTEXT, false ) PASS_LONGTEXT, false )
add_string( "smb-domain", NULL, DOMAIN_TEXT, add_string( "smb-domain", NULL, DOMAIN_TEXT,
DOMAIN_LONGTEXT, false ) DOMAIN_LONGTEXT, false )
......
...@@ -100,7 +100,7 @@ vlc_module_begin () ...@@ -100,7 +100,7 @@ vlc_module_begin ()
set_subcategory( SUBCAT_SOUT_ACO ) set_subcategory( SUBCAT_SOUT_ACO )
add_string( SOUT_CFG_PREFIX "user", "", add_string( SOUT_CFG_PREFIX "user", "",
USER_TEXT, USER_LONGTEXT, true ) USER_TEXT, USER_LONGTEXT, true )
add_password( SOUT_CFG_PREFIX "pwd", "", NULL, add_password( SOUT_CFG_PREFIX "pwd", "",
PASS_TEXT, PASS_LONGTEXT, true ) PASS_TEXT, PASS_LONGTEXT, true )
add_string( SOUT_CFG_PREFIX "mime", "", add_string( SOUT_CFG_PREFIX "mime", "",
MIME_TEXT, MIME_LONGTEXT, true ) MIME_TEXT, MIME_LONGTEXT, true )
......
...@@ -140,7 +140,7 @@ vlc_module_begin () ...@@ -140,7 +140,7 @@ vlc_module_begin ()
add_string( "rtsp-user", NULL, USER_TEXT, add_string( "rtsp-user", NULL, USER_TEXT,
USER_LONGTEXT, true ) USER_LONGTEXT, true )
change_safe() change_safe()
add_password( "rtsp-pwd", NULL, NULL, PASS_TEXT, add_password( "rtsp-pwd", NULL, PASS_TEXT,
PASS_LONGTEXT, true ) PASS_LONGTEXT, true )
change_safe() change_safe()
vlc_module_end () vlc_module_end ()
......
...@@ -164,7 +164,7 @@ vlc_module_begin () ...@@ -164,7 +164,7 @@ vlc_module_begin ()
set_description( N_("Submission of played songs to last.fm") ) set_description( N_("Submission of played songs to last.fm") )
add_string( "lastfm-username", "", add_string( "lastfm-username", "",
USERNAME_TEXT, USERNAME_LONGTEXT, false ) USERNAME_TEXT, USERNAME_LONGTEXT, false )
add_password( "lastfm-password", "", NULL, add_password( "lastfm-password", "",
PASSWORD_TEXT, PASSWORD_LONGTEXT, false ) PASSWORD_TEXT, PASSWORD_LONGTEXT, false )
add_string( "scrobbler-url", "post.audioscrobbler.com", add_string( "scrobbler-url", "post.audioscrobbler.com",
URL_TEXT, URL_LONGTEXT, false ) URL_TEXT, URL_LONGTEXT, false )
......
...@@ -116,7 +116,7 @@ vlc_module_begin () ...@@ -116,7 +116,7 @@ vlc_module_begin ()
TELNETHOST_LONGTEXT, true ) TELNETHOST_LONGTEXT, true )
add_integer( "telnet-port", TELNETPORT_DEFAULT, NULL, TELNETPORT_TEXT, add_integer( "telnet-port", TELNETPORT_DEFAULT, NULL, TELNETPORT_TEXT,
TELNETPORT_LONGTEXT, true ) TELNETPORT_LONGTEXT, true )
add_password( "telnet-password", TELNETPWD_DEFAULT, NULL, TELNETPWD_TEXT, add_password( "telnet-password", TELNETPWD_DEFAULT, TELNETPWD_TEXT,
TELNETPWD_LONGTEXT, true ) TELNETPWD_LONGTEXT, true )
set_callbacks( Open_LuaIntf, Close_LuaIntf ) set_callbacks( Open_LuaIntf, Close_LuaIntf )
......
...@@ -83,7 +83,7 @@ vlc_module_begin () ...@@ -83,7 +83,7 @@ vlc_module_begin ()
add_string( "growl-server", SERVER_DEFAULT, add_string( "growl-server", SERVER_DEFAULT,
SERVER_TEXT, SERVER_LONGTEXT, false ) SERVER_TEXT, SERVER_LONGTEXT, false )
add_password( "growl-password", PASS_DEFAULT, NULL, add_password( "growl-password", PASS_DEFAULT,
PASS_TEXT, PASS_LONGTEXT, false ) PASS_TEXT, PASS_LONGTEXT, false )
add_integer( "growl-port", 9887, NULL, add_integer( "growl-port", 9887, NULL,
PORT_TEXT, PORT_LONGTEXT, true ) PORT_TEXT, PORT_LONGTEXT, true )
......
...@@ -166,7 +166,7 @@ vlc_module_begin(); ...@@ -166,7 +166,7 @@ vlc_module_begin();
set_subcategory( SUBCAT_SOUT_STREAM ) set_subcategory( SUBCAT_SOUT_STREAM )
add_string( SOUT_CFG_PREFIX "host", "", add_string( SOUT_CFG_PREFIX "host", "",
HOST_TEXT, HOST_LONGTEXT, false ) HOST_TEXT, HOST_LONGTEXT, false )
add_password( SOUT_CFG_PREFIX "password", NULL, NULL, add_password( SOUT_CFG_PREFIX "password", NULL,
PASSWORD_TEXT, PASSWORD_LONGTEXT, false ) PASSWORD_TEXT, PASSWORD_LONGTEXT, false )
add_loadfile( SOUT_CFG_PREFIX "password-file", NULL, NULL, add_loadfile( SOUT_CFG_PREFIX "password-file", NULL, NULL,
PASSWORD_FILE_TEXT, PASSWORD_FILE_LONGTEXT, false ) PASSWORD_FILE_TEXT, PASSWORD_FILE_LONGTEXT, false )
......
...@@ -126,7 +126,7 @@ vlc_module_begin () ...@@ -126,7 +126,7 @@ vlc_module_begin ()
RMTOSD_HOST_LONGTEXT, false ) RMTOSD_HOST_LONGTEXT, false )
add_integer_with_range( RMTOSD_CFG "port", 20001, 1, 0xFFFF, NULL, add_integer_with_range( RMTOSD_CFG "port", 20001, 1, 0xFFFF, NULL,
RMTOSD_PORT_TEXT, RMTOSD_PORT_LONGTEXT, false ) RMTOSD_PORT_TEXT, RMTOSD_PORT_LONGTEXT, false )
add_password( RMTOSD_CFG "password", "", NULL, RMTOSD_PASSWORD_TEXT, add_password( RMTOSD_CFG "password", "", RMTOSD_PASSWORD_TEXT,
RMTOSD_PASSWORD_LONGTEXT, false ) RMTOSD_PASSWORD_LONGTEXT, false )
add_integer_with_range( RMTOSD_CFG "update", RMTOSD_UPDATE_DEFAULT, add_integer_with_range( RMTOSD_CFG "update", RMTOSD_UPDATE_DEFAULT,
RMTOSD_UPDATE_MIN, RMTOSD_UPDATE_MAX, NULL, RMTOSD_UPDATE_TEXT, RMTOSD_UPDATE_MIN, RMTOSD_UPDATE_MAX, NULL, RMTOSD_UPDATE_TEXT,
......
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