Commit a33d8caa authored by Rémi Duraffort's avatar Rémi Duraffort Committed by Jean-Baptiste Kempf

qt4_vlm: fix #3938 (options must be removed from the input)

(cherry picked from commit df316b5efcba5b2b50b9e27ba2f21574f21f5207)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 61644861
...@@ -672,9 +672,23 @@ void VLMWrapper::EditBroadcast( const QString& name, const QString& input, ...@@ -672,9 +672,23 @@ void VLMWrapper::EditBroadcast( const QString& name, const QString& input,
command = "setup \"" + name + "\" inputdel all"; command = "setup \"" + name + "\" inputdel all";
vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); vlm_ExecuteCommand( p_vlm, qtu( command ), &message );
vlm_MessageDelete( message ); vlm_MessageDelete( message );
command = "setup \"" + name + "\" input \"" + input + "\"";
vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); if(!input.isEmpty())
vlm_MessageDelete( message ); {
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() ) if( !output.isEmpty() )
{ {
command = "setup \"" + name + "\" output \"" + output + "\""; command = "setup \"" + name + "\" output \"" + output + "\"";
...@@ -745,9 +759,23 @@ void VLMWrapper::EditVod( const QString& name, const QString& input, ...@@ -745,9 +759,23 @@ void VLMWrapper::EditVod( const QString& name, const QString& input,
const QString& mux ) const QString& mux )
{ {
vlm_message_t *message; vlm_message_t *message;
QString command = "setup \"" + name + "\" input \"" + input + "\""; QString command;
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() ) if( !output.isEmpty() )
{ {
...@@ -791,9 +819,23 @@ void VLMWrapper::EditSchedule( const QString& name, const QString& input, ...@@ -791,9 +819,23 @@ void VLMWrapper::EditSchedule( const QString& name, const QString& input,
const QString& mux ) const QString& mux )
{ {
vlm_message_t *message; vlm_message_t *message;
QString command = "setup \"" + name + "\" input \"" + input + "\""; QString command;
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() ) if( !output.isEmpty() )
{ {
......
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