[vlc-commits] standard: mark URL and email option obsolete

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Apr  1 22:05:20 2020 +0300| [cd6541e284e8d2cc39e8126fcfbf1cfe1c35924f] | committer: Rémi Denis-Courmont

standard: mark URL and email option obsolete

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

 modules/stream_out/standard.c | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c
index 105bc206c3..21c7ffead2 100644
--- a/modules/stream_out/standard.c
+++ b/modules/stream_out/standard.c
@@ -63,16 +63,6 @@
 #define DESC_LONGTEXT N_( \
     "This allows you to give a short description with details about the stream, " \
     "that will be announced in the SDP (Session Descriptor)." )
-#define URL_TEXT N_("Session URL")
-#define URL_LONGTEXT N_( \
-    "This allows you to give a URL with more details about the stream " \
-    "(often the website of the streaming organization), that will " \
-    "be announced in the SDP (Session Descriptor)." )
-#define EMAIL_TEXT N_("Session email")
-#define EMAIL_LONGTEXT N_( \
-    "This allows you to give a contact mail address for the stream, that will " \
-    "be announced in the SDP (Session Descriptor)." )
-
 #define SAP_TEXT N_("SAP announcing")
 #define SAP_LONGTEXT N_("Announce this session with SAP.")
 
@@ -104,8 +94,8 @@ vlc_module_begin ()
     add_string( SOUT_CFG_PREFIX "name", "", NAME_TEXT, NAME_LONGTEXT, true )
     add_obsolete_string( SOUT_CFG_PREFIX "group" ) /* since 2.1.0 */
     add_string( SOUT_CFG_PREFIX "description", "", DESC_TEXT, DESC_LONGTEXT, true )
-    add_string( SOUT_CFG_PREFIX "url", "", URL_TEXT, URL_LONGTEXT, true )
-    add_string( SOUT_CFG_PREFIX "email", "", EMAIL_TEXT, EMAIL_LONGTEXT, true )
+    add_obsolete_string( SOUT_CFG_PREFIX "url" ) /* since 4.0.0 */
+    add_obsolete_string( SOUT_CFG_PREFIX "email" ) /* since 4.0.0 */
     add_obsolete_string( SOUT_CFG_PREFIX "phone" ) /* since 3.0.0 */
 
     set_callbacks( Open, Close )
@@ -117,7 +107,7 @@ vlc_module_end ()
  *****************************************************************************/
 static const char *const ppsz_sout_options[] = {
     "access", "mux", "url", "dst",
-    "sap", "name", "description", "url", "email",
+    "sap", "name", "description",
     "bind", "path", NULL
 };