Use the new SAP/SLP syntax (sap,slp,name=)

diff --git a/modules/gui/wxwindows/streamout.cpp b/modules/gui/wxwindows/streamout.cpp
index 693c382a4876b72a8d375d3629418bf5acb46dd4..0c1de5a5b11f5fe882e76b18efd4d4447373ab96 100644 (file)
--- a/modules/gui/wxwindows/streamout.cpp
+++ b/modules/gui/wxwindows/streamout.cpp
@@ -2,7 +2,7 @@
  * streamout.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2004 VideoLAN
- * $Id: streamout.cpp,v 1.43 2004/02/28 19:30:04 gbazin Exp $
+ * $Id$
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -357,17 +357,26 @@ void SoutDialog::UpdateMRL()
         /* SAP only if UDP */
         if( sap_checkbox->IsChecked() )
         {
-            dup_opts += wxT(",sap=\"");
-            dup_opts += announce_addr->GetLineText(0);
-            dup_opts += wxT("\"");
+            dup_opts += wxT(",sap");
+            if( ! announce_addr->GetLineText(0).IsEmpty() )
+            {
+                dup_opts += wxT(",name=\"");
+                dup_opts += announce_addr->GetLineText(0);
+                dup_opts += wxT("\"");
+            }
         }
 
         /* SLP only if UDP */
         if( slp_checkbox->IsChecked() )
         {
-            dup_opts += wxT(",slp=\"");
-            dup_opts += announce_addr->GetLineText(0);
-            dup_opts += wxT("\"");
+            dup_opts += wxT(",slp");
+            if( ! sap_checkbox->IsChecked() &&
+                ! announce_addr->GetLineText(0).IsEmpty() )
+            {
+                dup_opts += wxT(",name=\"");
+                dup_opts += announce_addr->GetLineText(0);
+                dup_opts += wxT("\"");
+            }
         }
 
         dup_opts += wxT("}");