/*****************************************************************************
* sout.cpp : Stream output dialog ( old-style )
****************************************************************************
- * Copyright ( C ) 2006 the VideoLAN team
- * Copyright (C) 2007 Société des arts technologiques
- * Copyright (C) 2007 Savoir-faire Linux
+ * Copyright (C) 2007-2009 the VideoLAN team
*
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
* Jean-Baptiste Kempf <jb@videolan.org>
- * Jean-François Massol <jf.massol -at- gmail.com>
- * Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include "dialogs/sout.hpp"
-#include <vlc_streaming.h>
+#include "util/qt_dirs.hpp"
+#include "components/sout/sout_widgets.hpp"
-#include <iostream>
#include <QString>
#include <QFileDialog>
+#include <QToolButton>
+#include <QSpinBox>
+#include <assert.h>
-SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf,
- bool _transcode_only ) : QVLCDialog( parent, _p_intf )
+SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf, const QString& inputMRL )
+ : QVLCDialog( parent, _p_intf )
{
- setWindowTitle( qtr( "Stream output" ) );
-
- b_transcode_only = _transcode_only;
+ setWindowTitle( qtr( "Stream Output" ) );
+ setWindowRole( "vlc-stream-output" );
/* UI stuff */
ui.setupUi( this );
-
- ui.UDPEdit->hide(); ui.UDPLabel->hide();
- ui.UDPPort->hide(); ui.UDPPortLabel->hide();
-/* ADD HERE for new profiles */
-#define ADD_PROFILE( name, shortname ) ui.profileBox->addItem( qtr( name ), QVariant( QString( shortname ) ) );
- ADD_PROFILE( "Custom" , "Custom" )
- ADD_PROFILE( "IPod (mp4/aac)", "IPod" )
- ADD_PROFILE( "XBox", "XBox" )
- ADD_PROFILE( "Windows (wmv/asf)", "Windows" )
- ADD_PROFILE( "PSP", "PSP")
- ADD_PROFILE( "GSM", "GSM" )
-
-#define ADD_VCODEC( name, fourcc ) ui.vCodecBox->addItem( name, QVariant( fourcc ) );
- ADD_VCODEC( "MPEG-1", "mp1v" )
- ADD_VCODEC( "MPEG-2", "mp2v" )
- ADD_VCODEC( "MPEG-4", "mp4v" )
- ADD_VCODEC( "DIVX 1" , "DIV1" )
- ADD_VCODEC( "DIVX 2" , "DIV1" )
- ADD_VCODEC( "DIVX 3" , "DIV1" )
- ADD_VCODEC( "H-263", "H263" )
- ADD_VCODEC( "H-264", "h264" )
- ADD_VCODEC( "WMV1", "WMV1" )
- ADD_VCODEC( "WMV2" , "WMV2" )
- ADD_VCODEC( "M-JPEG", "MJPG" )
- ADD_VCODEC( "Theora", "theo" )
-
-#define ADD_ACODEC( name, fourcc ) ui.aCodecBox->addItem( name, QVariant( fourcc ) );
- ADD_ACODEC( "MPEG Audio", "mpga" )
- ADD_ACODEC( "MP3", "mp3" )
- ADD_ACODEC( "MPEG 4 Audio ( AAC )", "mp4a" )
- ADD_ACODEC( "A52/AC-3", "a52" )
- ADD_ACODEC( "Vorbis", "vorb" )
- ADD_ACODEC( "Flac", "flac" )
- ADD_ACODEC( "Speex", "spx" )
- ADD_ACODEC( "WAV", "s16l" )
- ADD_ACODEC( "WMA", "wma" )
-
-#define ADD_SCALING( factor ) ui.vScaleBox->addItem( factor );
- ADD_SCALING( "0.25" )
- ADD_SCALING( "0.5" )
- ADD_SCALING( "0.75" )
- ADD_SCALING( "1" )
- ADD_SCALING( "1.25" )
- ADD_SCALING( "1.5" )
- ADD_SCALING( "1.75" )
- ADD_SCALING( "2" )
-
- ui.mrlEdit->setToolTip ( qtr( "Stream output string.\n This is automatically generated "
- "when you change the above settings,\n but you can update it manually." ) ) ;
+ ui.inputBox->setMRL( inputMRL );
+ ui.helpEdit->setPlainText( qtr("This dialog will allow you to stream or "
+ "convert your media for use locally, on your private network, "
+ "or on the Internet.\n"
+ "You should start by checking that source matches what you want "
+ "your input to be and then press the \"Next\" "
+ "button to continue.\n") );
+
+ ui.mrlEdit->setToolTip ( qtr( "Stream output string.\n"
+ "This is automatically generated "
+ "when you change the above settings,\n"
+ "but you can change it manually." ) ) ;
+
+#if 0
+ /* This needs Qt4.5 to be cool */
+ ui.destTab->setTabsClosable( true );
+#else
+ closeTabButton = new QToolButton( this );
+ ui.destTab->setCornerWidget( closeTabButton );
+ closeTabButton->hide();
+ closeTabButton->setAutoRaise( true );
+ closeTabButton->setIcon( QIcon( ":/toolbar/clear" ) );
+ BUTTONACT( closeTabButton, closeTab() );
+#endif
+ CONNECT( ui.destTab, currentChanged( int ), this, tabChanged( int ) );
+ ui.destTab->setTabIcon( 0, QIcon( ":/buttons/playlist/playlist_add" ) );
+
+ ui.destBox->addItem( qtr( "File" ) );
+ ui.destBox->addItem( "HTTP" );
+ ui.destBox->addItem( "MS-WMSP (MMSH)" );
+ ui.destBox->addItem( "RTSP" );
+ ui.destBox->addItem( "RTP / MPEG Transport Stream" );
+ ui.destBox->addItem( "RTP Audio/Video Profile" );
+ ui.destBox->addItem( "UDP (legacy)" );
+ ui.destBox->addItem( "IceCast" );
+
+ BUTTONACT( ui.addButton, addDest() );
// /* Connect everything to the updateMRL function */
- #define CB( x ) CONNECT( ui.x, toggled( bool ), this, updateMRL() );
- #define CT( x ) CONNECT( ui.x, textChanged( const QString ), this, updateMRL() );
- #define CS( x ) CONNECT( ui.x, valueChanged( int ), this, updateMRL() );
- #define CC( x ) CONNECT( ui.x, currentIndexChanged( int ), this, updateMRL() );
-// /* Output */
- CB( fileOutput ); CB( HTTPOutput ); CB( localOutput );
- CB( RTPOutput ); CB( MMSHOutput ); CB( rawInput ); CB( UDPOutput );
- CT( fileEdit ); CT( HTTPEdit ); CT( RTPEdit ); CT( MMSHEdit ); CT( UDPEdit );
- CT( IcecastEdit ); CT( IcecastMountpointEdit ); CT( IcecastNamePassEdit );
- CS( HTTPPort ); CS( RTPPort ); CS( MMSHPort ); CS( UDPPort );
-// /* Transcode */
- CC( vCodecBox ); CC( subsCodecBox ); CC( aCodecBox ) ;
- CB( transcodeVideo ); CB( transcodeAudio ); CB( transcodeSubs );
-// CB( sOverlay );
- CS( vBitrateSpin ); CS( aBitrateSpin ); CS( aChannelsSpin ); CC( vScaleBox );
-// /* Mux */
- CB( PSMux ); CB( TSMux ); CB( MPEG1Mux ); CB( OggMux ); CB( ASFMux );
- CB( MP4Mux ); CB( MOVMux ); CB( WAVMux ); CB( RAWMux ); CB( FLVMux );
-// /* Misc */
- CB( soutAll ); CS( ttl ); CT( sapName ); CT( sapGroup );
-//
- CONNECT( ui.profileBox, activated( const QString & ), this, setOptions() );
- CONNECT( ui.fileSelectButton, clicked() , this, fileBrowse() );
- CONNECT( ui.transcodeVideo, toggled( bool ), this, setVTranscodeOptions( bool ) );
- CONNECT( ui.transcodeAudio, toggled( bool ), this, setATranscodeOptions( bool ) );
- CONNECT( ui.transcodeSubs, toggled( bool ), this, setSTranscodeOptions( bool ) );
- CONNECT( ui.rawInput, toggled( bool ), this, setRawOptions( bool ) );
+#define CB( x ) CONNECT( ui.x, toggled( bool ), this, updateMRL() );
+#define CT( x ) CONNECT( ui.x, textChanged( const QString& ), this, updateMRL() );
+#define CS( x ) CONNECT( ui.x, valueChanged( int ), this, updateMRL() );
+#define CC( x ) CONNECT( ui.x, currentIndexChanged( int ), this, updateMRL() );
+
+ /* Misc */
+ CB( soutAll ); CS( ttl ); CT( sapName ); CT( sapGroup );
+ CB( localOutput ); CB( transcodeBox );
+ CONNECT( ui.profileSelect, optionsChanged(), this, updateMRL() );
okButton = new QPushButton( qtr( "&Stream" ) );
QPushButton *cancelButton = new QPushButton( qtr( "&Cancel" ) );
BUTTONACT( okButton, ok() );
BUTTONACT( cancelButton, cancel() );
- if( b_transcode_only ) toggleSout();
-}
-
-QString SoutDialog::getMrl()
-{
- return mrl;
-}
+ BUTTONACT( ui.nextButton, next() );
+ BUTTONACT( ui.nextButton2, next() );
+ BUTTONACT( ui.prevButton, prev() );
+ BUTTONACT( ui.prevButton2, prev() );
-void SoutDialog::fileBrowse()
-{
- ui.tabWidget->setTabEnabled( 0,false );
- QString fileName = QFileDialog::getSaveFileName( this, qtr( "Save file" ), "",
- qtr( "Containers (*.ps *.ts *.mpg *.ogg *.asf *.mp4 *.mov *.wav *.raw *.flv)" ) );
- ui.fileEdit->setText( fileName );
- updateMRL();
+#undef CC
+#undef CS
+#undef CT
+#undef CB
}
-void SoutDialog::setVTranscodeOptions( bool b_trans )
+void SoutDialog::next()
{
- ui.vCodecLabel->setEnabled( b_trans );
- ui.vCodecBox->setEnabled( b_trans );
- ui.vBitrateLabel->setEnabled( b_trans );
- ui.vBitrateSpin->setEnabled( b_trans );
- ui.vScaleLabel->setEnabled( b_trans );
- ui.vScaleBox->setEnabled( b_trans );
+ ui.toolBox->setCurrentIndex( ui.toolBox->currentIndex() + 1 );
}
-void SoutDialog::setATranscodeOptions( bool b_trans )
+void SoutDialog::prev()
{
- ui.aCodecLabel->setEnabled( b_trans );
- ui.aCodecBox->setEnabled( b_trans );
- ui.aBitrateLabel->setEnabled( b_trans );
- ui.aBitrateSpin->setEnabled( b_trans );
- ui.aChannelsLabel->setEnabled( b_trans );
- ui.aChannelsSpin->setEnabled( b_trans );
+ ui.toolBox->setCurrentIndex( ui.toolBox->currentIndex() - 1 );
}
-void SoutDialog::setSTranscodeOptions( bool b_trans )
+void SoutDialog::tabChanged( int i )
{
- ui.subsCodecBox->setEnabled( b_trans );
- ui.subsOverlay->setEnabled( b_trans );
+ closeTabButton->setVisible( (i != 0) );
}
-void SoutDialog::setRawOptions( bool b_raw )
+void SoutDialog::closeTab()
{
- if ( b_raw )
- {
- ui.tabWidget->setDisabled( true );
- }
- else
- {
- SoutDialog::setOptions();
- }
-}
-
-void SoutDialog::setOptions()
-{
- QString profileString = ui.profileBox->itemData( ui.profileBox->currentIndex() ).toString();
- msg_Dbg( p_intf, "Profile Used: %s", qta( profileString ));
- int index;
-
-#define setProfile( muxName, hasVideo, vCodecName, hasAudio, aCodecName ) \
- { \
- ui.muxName ##Mux->setChecked( true ); \
- \
- ui.transcodeAudio->setChecked( hasAudio ); \
- index = ui.aCodecBox->findText( vCodecName ); \
- if( index >= 0 ) ui.aCodecBox->setCurrentIndex( index ); \
- \
- ui.transcodeVideo->setChecked( hasVideo ); \
- index = ui.aCodecBox->findText( vCodecName ); \
- if( index >=0 ) ui.vCodecBox->setCurrentIndex( index ); \
- }
+ int i = ui.destTab->currentIndex();
+ if( i == 0 ) return;
- /* ADD HERE the profiles you want and need */
- if( profileString == "IPod" ) setProfile( MP4, true, "mp4a", true, "mp4v" )
- else if( profileString == "XBox" ) setProfile( ASF, true, "wma", true, "WMV2" )
-
- /* If the profile is not a custom one, then disable the tabWidget */
- if ( profileString == "Custom" )
- {
- ui.tabWidget->setEnabled( true );
- }
- else
- {
- ui.tabWidget->setDisabled( true );
- }
-
- /* Update the MRL !! */
+ QWidget *temp = ui.destTab->currentWidget();
+ ui.destTab->removeTab( i );
+ delete temp;
updateMRL();
}
-void SoutDialog::toggleSout()
+void SoutDialog::addDest( )
{
- //Toggle all the streaming options.
- TOGGLEV( ui.HTTPOutput ) ; TOGGLEV( ui.RTPOutput ) ; TOGGLEV( ui.MMSHOutput ) ; TOGGLEV( ui.UDPOutput ) ;
- TOGGLEV( ui.HTTPEdit ) ; TOGGLEV( ui.RTPEdit ) ; TOGGLEV( ui.MMSHEdit ) ; TOGGLEV( ui.UDPEdit ) ;
- TOGGLEV( ui.HTTPLabel ) ; TOGGLEV( ui.RTPLabel ) ; TOGGLEV( ui.MMSHLabel ) ; TOGGLEV( ui.UDPLabel ) ;
- TOGGLEV( ui.HTTPPortLabel ) ; TOGGLEV( ui.RTPPortLabel ) ; TOGGLEV( ui.MMSHPortLabel ) ; TOGGLEV( ui.UDPPortLabel )
- TOGGLEV( ui.HTTPPort ) ; TOGGLEV( ui.RTPPort ) ; TOGGLEV( ui.MMSHPort ) ; TOGGLEV( ui.UDPPort ) ;
+ VirtualDestBox *db;
+ QString caption;
- TOGGLEV( ui.sap ); TOGGLEV( ui.sapName );
- TOGGLEV( ui.sapGroup ); TOGGLEV( ui.sapGroupLabel );
- TOGGLEV( ui.ttlLabel ); TOGGLEV( ui.ttl );
-
- if( b_transcode_only ) okButton->setText( "&Save" );
- else okButton->setText( "&Stream" );
+ switch( ui.destBox->currentIndex() )
+ {
+ case 0:
+ db = new FileDestBox( this );
+ caption = qtr( "File" );
+ break;
+ case 1:
+ db = new HTTPDestBox( this );
+ caption = qfu( "HTTP" );
+ break;
+ case 2:
+ db = new MMSHDestBox( this );
+ caption = qfu( "WMSP" );
+ break;
+ case 3:
+ db = new RTSPDestBox( this );
+ caption = qfu( "RTSP" );
+ break;
+ case 4:
+ db = new RTPDestBox( this, "ts" );
+ caption = "RTP/TS";
+ break;
+ case 5:
+ db = new RTPDestBox( this );
+ caption = "RTP/AVP";
+ break;
+ case 6:
+ db = new UDPDestBox( this );
+ caption = "UDP";
+ break;
+ case 7:
+ db = new ICEDestBox( this );
+ caption = "Icecast";
+ break;
+ default:
+ assert(0);
+ }
- updateGeometry();
+ int index = ui.destTab->addTab( db, caption );
+ CONNECT( db, mrlUpdated(), this, updateMRL() );
+ ui.destTab->setCurrentIndex( index );
+ updateMRL();
}
void SoutDialog::ok()
{
- mrl = ui.mrlEdit->text();
+ mrl = ui.mrlEdit->toPlainText();
accept();
}
+
void SoutDialog::cancel()
{
- mrl = ui.mrlEdit->text();
+ mrl.clear();
reject();
}
void SoutDialog::updateMRL()
{
- sout_gui_descr_t sout;
- memset( &sout, 0, sizeof( sout_gui_descr_t ) );
- unsigned int counter = 0;
-
- sout.b_local = ui.localOutput->isChecked();
- sout.b_file = ui.fileOutput->isChecked();
- sout.b_http = ui.HTTPOutput->isChecked();
- sout.b_mms = ui.MMSHOutput->isChecked();
- sout.b_icecast = ui.IcecastOutput->isChecked();
- sout.b_rtp = ui.RTPOutput->isChecked();
- sout.b_udp = ui.UDPOutput->isChecked();
- sout.b_sap = ui.sap->isChecked();
- sout.b_all_es = ui.soutAll->isChecked();
- sout.psz_vcodec = strdup( qtu( ui.vCodecBox->itemData( ui.vCodecBox->currentIndex() ).toString() ) );
- sout.psz_acodec = strdup( qtu( ui.aCodecBox->itemData( ui.aCodecBox->currentIndex() ).toString() ) );
- sout.psz_scodec = strdup( qtu( ui.subsCodecBox->itemData( ui.subsCodecBox->currentIndex() ).toString() ) );
- sout.psz_file = strdup( qtu( ui.fileEdit->text() ) );
- sout.psz_http = strdup( qtu( ui.HTTPEdit->text() ) );
- sout.psz_mms = strdup( qtu( ui.MMSHEdit->text() ) );
- sout.psz_rtp = strdup( qtu( ui.RTPEdit->text() ) );
- sout.psz_udp = strdup( qtu( ui.UDPEdit->text() ) );
- sout.psz_icecast = strdup( qtu( ui.IcecastEdit->text() ) );
- sout.sa_icecast.psz_username = strdup( qtu( ui.IcecastNamePassEdit->text() ) );
- sout.sa_icecast.psz_password = strdup( qtu( ui.IcecastNamePassEdit->text() ) );
- sout.psz_icecast_mountpoint = strdup( qtu( ui.IcecastMountpointEdit->text() ) );
- sout.i_http = ui.HTTPPort->value();
- sout.i_mms = ui.MMSHPort->value();
- sout.i_rtp = ui.RTPPort->value();
- sout.i_udp = ui.UDPPort->value();
- sout.i_icecast = ui.IcecastPort->value();
- sout.i_ab = ui.aBitrateSpin->value();
- sout.i_vb = ui.vBitrateSpin->value();
- sout.i_channels = ui.aChannelsSpin->value();
- sout.f_scale = atof( qta( ui.vScaleBox->currentText() ) );
- sout.psz_group = strdup( qtu( ui.sapGroup->text() ) );
- sout.psz_name = strdup( qtu( ui.sapName->text() ) );
-
- if ( sout.b_local ) counter++ ;
- if ( sout.b_file ) counter++ ;
- if ( sout.b_http ) counter++ ;
- if ( sout.b_mms ) counter++ ;
- if ( sout.b_rtp ) counter++ ;
- if ( sout.b_udp ) counter ++;
- if ( sout.b_icecast ) counter ++;
-
-#define SMUX( x, txt ) if( ui.x->isChecked() ) sout.psz_mux = strdup( txt );
- SMUX( PSMux, "ps" );
- SMUX( TSMux, "ts" );
- SMUX( MPEG1Mux, "mpeg" );
- SMUX( OggMux, "ogg" );
- SMUX( ASFMux, "asf" );
- SMUX( MP4Mux, "mp4" );
- SMUX( MOVMux, "mov" );
- SMUX( WAVMux, "wav" );
- SMUX( RAWMux, "raw" );
- SMUX( FLVMux, "flv" );
- SMUX( MKVMux, "mkv" );
-
- bool trans = false;
- bool more = false;
-
- if ( ui.transcodeVideo->isChecked() || ui.transcodeAudio->isChecked() )
- {
- if ( ui.transcodeVideo->isChecked() )
- {
- mrl = ":sout=#transcode{";
- mrl.append( "vcodec=" );
- mrl.append( sout.psz_vcodec );
- mrl.append( "," );
- mrl.append( "vb=" );
- mrl.append( QString::number( sout.i_vb,10 ) );
- mrl.append( "," );
- mrl.append( "scale=" );
- mrl.append( QString::number( sout.f_scale ) );
- trans = true;
- }
+ QString qs_mux = ui.profileSelect->getMux();
- if ( ui.transcodeAudio->isChecked() )
- {
- if ( trans )
- {
- mrl.append( "," );
- }
- else
- {
- mrl = ":sout=#transcode{";
- }
- mrl.append( "acodec=" );
- mrl.append( sout.psz_acodec );
- mrl.append( "," );
- mrl.append( "ab=" );
- mrl.append( QString::number( sout.i_ab,10 ) );
- mrl.append( "," );
- mrl.append( "channels=" );
- mrl.append( QString::number( sout.i_channels,10 ) );
- trans = true;
- }
- mrl.append( "}" );
- }
-
- if ( sout.b_local || sout.b_file || sout.b_http || sout.b_mms || sout.b_rtp || sout.b_udp )
+ SoutMrl smrl( ":sout=#" );
+ if( !ui.profileSelect->getTranscode().isEmpty() && ui.transcodeBox->isChecked() )
{
+ smrl.begin( ui.profileSelect->getTranscode() );
+ smrl.end();
+ }
-#define ISMORE() if ( more ) mrl.append( "," );
-#define ATLEASTONE() if ( counter ) mrl.append( "dst=" );
-
-#define CHECKMUX() \
- if( sout.psz_mux ) \
- { \
- mrl.append( ",mux=");\
- mrl.append( sout.psz_mux ); \
- }
-
- if ( trans )
- {
- mrl.append( ":" );
- }
- else
- {
- mrl = ":sout=#";
- }
+ bool multi = false;
- if ( counter )
- {
- mrl.append( "duplicate{" );
- }
+ if( ui.destTab->count() >= 3 ||
+ ( ui.destTab->count() == 2 && ui.localOutput->isChecked() ) )
+ multi = true;
- if ( sout.b_local )
- {
- ISMORE();
- ATLEASTONE()
- mrl.append( "display" );
- more = true;
- }
+ if( multi )
+ smrl.begin( "duplicate" );
- if ( sout.b_file )
- {
- ISMORE();
- ATLEASTONE()
- mrl.append( "std{access=file" );
- CHECKMUX();
- mrl.append( ",dst=" );
- mrl.append( sout.psz_file );
- mrl.append( "}" );
- more = true;
- }
+ for( int i = 1; i < ui.destTab->count(); i++ )
+ {
+ VirtualDestBox *vdb = qobject_cast<VirtualDestBox *>(ui.destTab->widget( i ));
+ if( !vdb )
+ continue;
- if ( sout.b_http )
- {
- ISMORE();
- ATLEASTONE()
- mrl.append( "std{access=http" );
- CHECKMUX();
- mrl.append( ",dst=" );
- mrl.append( sout.psz_http );
- mrl.append( ":" );
- mrl.append( QString::number( sout.i_http,10 ) );
- mrl.append( "}" );
- more = true;
- }
+ QString tempMRL = vdb->getMRL( qs_mux );
+ if( tempMRL.isEmpty() ) continue;
- if ( sout.b_mms )
+ if( multi )
+ smrl.option( "dst", tempMRL );
+ else
{
- ISMORE();
- ATLEASTONE()
- mrl.append( "std{access=mmsh" );
- CHECKMUX();
- mrl.append( ",dst=" );
- mrl.append( sout.psz_mms );
- mrl.append( ":" );
- mrl.append( QString::number( sout.i_mms,10 ) );
- mrl.append( "}" );
- more = true;
+ smrl.begin( tempMRL);
+ smrl.end();
}
-
- if ( sout.b_rtp )
+ }
+ if( ui.localOutput->isChecked() )
+ {
+ if( multi )
+ smrl.option( "dst", "display" );
+ else
{
- ISMORE();
- ATLEASTONE()
- mrl.append( "rtp{" );
- CHECKMUX();
- mrl.append( ",dst=" );
- mrl.append( sout.psz_rtp );
- mrl.append( ":" );
- mrl.append( QString::number( sout.i_rtp,10 ) );
- mrl.append( "}" );
- more = true;
+ smrl.begin( "display" );
+ smrl.end();
}
+ }
- if ( sout.b_udp )
- {
- ISMORE();
- ATLEASTONE()
- mrl.append( "std{access=udp" );
- CHECKMUX();
- mrl.append( ",dst=" );
- mrl.append( sout.psz_udp );
- mrl.append( ":" );
- mrl.append( QString::number( sout.i_udp,10 ) );
- if ( sout.b_sap )
- {
- mrl.append( ",sap," );
- mrl.append( "group=\"" );
- mrl.append( sout.psz_group );
- mrl.append( "\"," );
- mrl.append( "name=\"" );
- mrl.append( sout.psz_name );
- mrl.append( "\"" );
- }
- mrl.append( "}" );
- more = true;
- }
+ if ( multi ) smrl.end();
- if( sout.b_icecast )
- {
- // TODO
- }
+ mrl = smrl.getMrl();
- if ( counter )
- {
- mrl.append( "}" );
- }
+ if( ui.sap->isChecked() )
+ {
+ QString group = ui.sapGroup->text();
+ QString name = ui.sapName->text();
+
+ /* FIXME: This sucks. We should really return a QStringList instead of
+ * (mis)quoting, concatainating and split input item paramters. */
+ name = name.replace( " ", " " );
+ group = group.replace( " ", " " );
+
+ /* We need to add options for both standard and rtp targets */
+ /* This is inelegant but simple and functional */
+ mrl.append( qfu( " :sout-rtp-sap" ) );
+ mrl.append( qfu( " :sout-rtp-name=" ) + name );
+ mrl.append( qfu( " :sout-standard-sap" ) );
+ mrl.append( qfu( " :sout-standard-name=" ) + name );
+ mrl.append( qfu( " :sout-standard-group=" ) + group );
+ }
+ else
+ {
+ mrl.append( qfu( " :no-sout-rtp-sap" ) );
+ mrl.append( qfu( " :no-sout-standard-sap" ) );
}
-#undef CHECKMUX
+ if( ui.soutAll->isChecked() ) mrl.append( " :sout-all" );
- if ( sout.b_all_es )
- mrl.append( ":sout-all" );
+ if( ui.ttl->value() != 1 ) mrl.append( " :ttl=" + ui.ttl->value() );
- ui.mrlEdit->setText( mrl );
- free( sout.psz_acodec ); free( sout.psz_vcodec ); free( sout.psz_scodec );
- free( sout.psz_file );free( sout.psz_http ); free( sout.psz_mms );
- free( sout.psz_rtp ); free( sout.psz_udp ); free( sout.psz_mux );
- free( sout.psz_name ); free( sout.psz_group );
- free( sout.psz_icecast ); free( sout.psz_icecast_mountpoint );
- free( sout.sa_icecast.psz_password ); free( sout.sa_icecast.psz_username );
+ mrl.append( " :sout-keep" );
+
+ ui.mrlEdit->setPlainText( mrl );
}
+
projects / vlc / blobdiff