From 10df88b6a99e2c826592298c338d5f0ebd1c044f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Cl=C3=A9ment=20Stenac?= Date: Sun, 16 May 2004 10:46:54 +0000 Subject: [PATCH] Use the new SAP/SLP syntax (sap,slp,name=) --- modules/gui/wxwindows/streamout.cpp | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/modules/gui/wxwindows/streamout.cpp b/modules/gui/wxwindows/streamout.cpp index 693c382a48..0c1de5a5b1 100644 --- 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 * @@ -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("}"); -- 2.39.2