From df316b5efcba5b2b50b9e27ba2f21574f21f5207 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Duraffort?= Date: Mon, 26 Jul 2010 22:16:15 +0200 Subject: [PATCH] qt4_vlm: fix #3938 (options must be removed from the input) --- modules/gui/qt4/dialogs/vlm.cpp | 60 ++++++++++++++++++++++++++++----- 1 file changed, 51 insertions(+), 9 deletions(-) diff --git a/modules/gui/qt4/dialogs/vlm.cpp b/modules/gui/qt4/dialogs/vlm.cpp index ef02c6c88b..af8adea71e 100644 --- a/modules/gui/qt4/dialogs/vlm.cpp +++ b/modules/gui/qt4/dialogs/vlm.cpp @@ -672,9 +672,23 @@ void VLMWrapper::EditBroadcast( const QString& name, const QString& input, command = "setup \"" + name + "\" inputdel all"; vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); vlm_MessageDelete( message ); - command = "setup \"" + name + "\" input \"" + input + "\""; - vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); - vlm_MessageDelete( message ); + + if(!input.isEmpty()) + { + QStringList inputs = input.split(":", QString::SkipEmptyParts); + + command = "setup \"" + name + "\" input \"" + inputs[0].trimmed() + "\""; + vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); + vlm_MessageDelete( message ); + + for( int i = 1; i < inputs.size(); i++ ) + { + command = "setup \"" + name + "\" option \"" + inputs[i].trimmed() + "\""; + vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); + vlm_MessageDelete( message ); + } + } + if( !output.isEmpty() ) { command = "setup \"" + name + "\" output \"" + output + "\""; @@ -745,9 +759,23 @@ void VLMWrapper::EditVod( const QString& name, const QString& input, const QString& mux ) { vlm_message_t *message; - QString command = "setup \"" + name + "\" input \"" + input + "\""; - vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); - vlm_MessageDelete( message ); + QString command; + + if(!input.isEmpty()) + { + QStringList inputs = input.split(":", QString::SkipEmptyParts); + + command = "setup \"" + name + "\" input \"" + inputs[0].trimmed() + "\""; + vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); + vlm_MessageDelete( message ); + + for( int i = 1; i < inputs.size(); i++ ) + { + command = "setup \"" + name + "\" option \"" + inputs[i].trimmed() + "\""; + vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); + vlm_MessageDelete( message ); + } + } if( !output.isEmpty() ) { @@ -791,9 +819,23 @@ void VLMWrapper::EditSchedule( const QString& name, const QString& input, const QString& mux ) { vlm_message_t *message; - QString command = "setup \"" + name + "\" input \"" + input + "\""; - vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); - vlm_MessageDelete( message ); + QString command; + + if(!input.isEmpty()) + { + QStringList inputs = input.split(":", QString::SkipEmptyParts); + + command = "setup \"" + name + "\" input \"" + inputs[0].trimmed() + "\""; + vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); + vlm_MessageDelete( message ); + + for( int i = 1; i < inputs.size(); i++ ) + { + command = "setup \"" + name + "\" option \"" + inputs[i].trimmed() + "\""; + vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); + vlm_MessageDelete( message ); + } + } if( !output.isEmpty() ) { -- 2.39.2