X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fdialogs%2Fvlm.cpp;h=2bbe79ea12a1d88c684a92968f79cd791f845fd9;hb=4d85871d1b29265a6cc5744677f0f0bb9bfac20f;hp=6aa2aa575c19febeb4f2a8d8b4dd6ca760c9ca4b;hpb=4a48618f601361d94c2f4417a475b3faf71487c6;p=vlc diff --git a/modules/gui/qt4/dialogs/vlm.cpp b/modules/gui/qt4/dialogs/vlm.cpp index 6aa2aa575c..2bbe79ea12 100644 --- a/modules/gui/qt4/dialogs/vlm.cpp +++ b/modules/gui/qt4/dialogs/vlm.cpp @@ -1,8 +1,8 @@ /***************************************************************************** * vlm.cpp : VLM Management **************************************************************************** - * Copyright ( C ) 2006 the VideoLAN team - * $Id: sout.cpp 21875 2007-09-08 16:01:33Z jb $ + * Copyright © 2008 the VideoLAN team + * $Id$ * * Authors: Jean-Baptiste Kempf * Jean-François Massol @@ -23,11 +23,16 @@ * Foundation, Inc., 51 Franklin street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#ifdef ENABLE_VLM +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include "dialogs/vlm.hpp" + +#ifdef ENABLE_VLM #include "dialogs/open.hpp" #include "dialogs/sout.hpp" +#include "util/qt_dirs.hpp" #include #include @@ -43,15 +48,14 @@ #include #include #include +#include #include #include #include +#include -static const char *psz_type[] = { "Broadcast", "Schedule", "VOD" }; -VLMDialog *VLMDialog::instance = NULL; - -VLMDialog::VLMDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) +VLMDialog::VLMDialog( intf_thread_t *_p_intf ) : QVLCDialog( (QWidget*)_p_intf->p_sys->p_mi, _p_intf ) { p_vlm = vlm_New( p_intf ); @@ -67,16 +71,16 @@ VLMDialog::VLMDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) ui.saveButton->hide(); #define ADDMEDIATYPES( str, type ) ui.mediaType->addItem( qtr( str ), QVariant( type ) ); - ADDMEDIATYPES( "Broadcast", QVLM_Broadcast ); - ADDMEDIATYPES( "Schedule", QVLM_Schedule ); - ADDMEDIATYPES( "Video On Demand ( VOD )", QVLM_VOD ); + ADDMEDIATYPES( N_("Broadcast"), QVLM_Broadcast ); + ADDMEDIATYPES( N_("Schedule"), QVLM_Schedule ); + ADDMEDIATYPES( N_("Video On Demand ( VOD )"), QVLM_VOD ); #undef ADDMEDIATYPES /* Schedule Stuffs */ QGridLayout *schetimelayout = new QGridLayout( ui.schedBox ); - QLabel *schetimelabel = new QLabel( qtr( "Hours/Minutes/Seconds:" ) ); + QLabel *schetimelabel = new QLabel( qtr( "Hours / Minutes / Seconds:" ) ); schetimelayout->addWidget( schetimelabel, 0, 0 ); - QLabel *schedatelabel = new QLabel( qtr( "Day Month Year:" ) ); + QLabel *schedatelabel = new QLabel( qtr( "Day / Month / Year:" ) ); schetimelayout->addWidget( schedatelabel, 1, 0 ); QLabel *scherepeatLabel = new QLabel( qtr( "Repeat:" ) ); schetimelayout->addWidget( scherepeatLabel, 2, 0 ); @@ -85,6 +89,7 @@ VLMDialog::VLMDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) time = new QDateTimeEdit( QTime::currentTime() ); time->setAlignment( Qt::AlignRight ); + time->setDisplayFormat( "hh:mm:ss" ); schetimelayout->addWidget( time, 0, 1, 1, 3 ); date = new QDateTimeEdit( QDate::currentDate() ); @@ -123,9 +128,16 @@ VLMDialog::VLMDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) new QSpacerItem( 10, 10, QSizePolicy::Minimum, QSizePolicy::Expanding); vlmItemLayout->addItem( spacer ); - QPushButton *closeButton = new QPushButton( qtr( "Close" ) ); + QPushButton *importButton = new QPushButton( qtr( "I&mport" ) ); + ui.buttonBox->addButton( importButton, QDialogButtonBox::ActionRole ); + + QPushButton *exportButton = new QPushButton( qtr( "E&xport" ) ); + ui.buttonBox->addButton( exportButton, QDialogButtonBox::ActionRole ); + + QPushButton *closeButton = new QPushButton( qtr( "&Close" ) ); ui.buttonBox->addButton( closeButton, QDialogButtonBox::AcceptRole ); + showScheduleWidget( QVLM_Broadcast ); /* Connect the comboBox to show the right Widgets */ @@ -137,19 +149,27 @@ VLMDialog::VLMDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) this, selectVLMItem( int ) ); BUTTONACT( closeButton, close() ); + BUTTONACT( exportButton, exportVLMConf() ); + BUTTONACT( importButton, importVLMConf() ); BUTTONACT( ui.addButton, addVLMItem() ); BUTTONACT( ui.clearButton, clearWidgets() ); BUTTONACT( ui.saveButton, saveModifications() ); BUTTONACT( ui.inputButton, selectInput() ); BUTTONACT( ui.outputButton, selectOutput() ); + //readSettings( "VLM", QSize( 700, 500 ) ); } VLMDialog::~VLMDialog() { - /* FIXME :you have to destroy vlm here to close + delete vlmWrapper; + + //writeSettings( "VLM" ); + /* TODO :you have to destroy vlm here to close * but we shouldn't destroy vlm here in case somebody else wants it */ if( p_vlm ) + { vlm_Delete( p_vlm ); + } } void VLMDialog::showScheduleWidget( int i ) @@ -161,10 +181,11 @@ void VLMDialog::showScheduleWidget( int i ) void VLMDialog::selectVLMItem( int i ) { - ui.vlmItemScroll->ensureWidgetVisible( vlmItems.at( i ) ); + if( i >= 0 ) + ui.vlmItemScroll->ensureWidgetVisible( vlmItems.at( i ) ); } -bool VLMDialog::isNameGenuine( QString name ) +bool VLMDialog::isNameGenuine( const QString& name ) { for( int i = 0; i < vlmItems.size(); i++ ) { @@ -182,7 +203,7 @@ void VLMDialog::addVLMItem() QString name = ui.nameLedit->text(); if( name.isEmpty() || !isNameGenuine( name ) ) { - msg_Dbg( p_intf, "VLM Name is empty or already exists, I can't do it" ); + msg_Err( p_intf, "VLM Name is empty or already exists, I can't do it" ); return; } @@ -193,27 +214,35 @@ void VLMDialog::addVLMItem() QString outputText = ui.outputLedit->text(); bool b_checked = ui.enableCheck->isChecked(); bool b_looped = ui.loopBCast->isChecked(); - + QDateTime schetime = time->dateTime(); + QDateTime schedate = date->dateTime(); + int repeatnum = scherepeatnumber->value(); + int repeatdays = repeatDays->value(); VLMAWidget * vlmAwidget; + outputText.remove( ":sout=" ); switch( type ) { case QVLM_Broadcast: typeShortName = "Bcast"; - vlmAwidget = new VLMBroadcast( name, inputText, outputText, - b_checked, b_looped, this ); - VLMWrapper::AddBroadcast( name, inputText, outputText, b_checked, b_looped ); + vlmAwidget = new VLMBroadcast( name, inputText, inputOptions, outputText, + b_checked, b_looped, this ); + VLMWrapper::AddBroadcast( name, inputText, inputOptions, outputText, b_checked, + b_looped ); break; case QVLM_VOD: typeShortName = "VOD"; - vlmAwidget = new VLMVod( name, inputText, outputText, + vlmAwidget = new VLMVod( name, inputText, inputOptions, outputText, b_checked, ui.muxLedit->text(), this ); - VLMWrapper::AddVod( name, inputText, outputText, b_checked ); + VLMWrapper::AddVod( name, inputText, inputOptions, outputText, b_checked ); break; case QVLM_Schedule: typeShortName = "Sched"; - vlmAwidget = new VLMSchedule( name, inputText, outputText, - b_checked, this ); + vlmAwidget = new VLMSchedule( name, inputText, inputOptions, outputText, + schetime, schedate, repeatnum, + repeatdays, b_checked, this ); + VLMWrapper::AddSchedule( name, inputText, inputOptions, outputText, schetime, + schedate, repeatnum, repeatdays, b_checked); break; default: msg_Warn( p_intf, "Something bad happened" ); @@ -228,12 +257,117 @@ void VLMDialog::addVLMItem() vlmItemLayout->insertWidget( vlmItemCount, vlmAwidget ); vlmItems.append( vlmAwidget ); + clearWidgets(); +} + +/* TODO : VOD are not exported to the file */ +bool VLMDialog::exportVLMConf() +{ + QString saveVLMConfFileName = QFileDialog::getSaveFileName( this, + qtr( "Save VLM configuration as..." ), + QVLCUserDir( VLC_DOCUMENTS_DIR ), + qtr( "VLM conf (*.vlm);;All (*)" ) ); + + if( !saveVLMConfFileName.isEmpty() ) + { + vlm_message_t *message; + QString command = "save \"" + saveVLMConfFileName + "\""; + vlm_ExecuteCommand( p_vlm , qtu( command ) , &message ); + vlm_MessageDelete( message ); + return true; + } + + return false; +} + +void VLMDialog::mediasPopulator() +{ + if( p_vlm ) + { + int i_nMedias; + QString typeShortName; + int vlmItemCount; + vlm_media_t ***ppp_dsc = (vlm_media_t ***)malloc( sizeof( vlm_media_t ) ); + + /* Get medias information and numbers */ + vlm_Control( p_vlm, VLM_GET_MEDIAS, ppp_dsc, &i_nMedias ); + + /* Loop on all of them */ + for( int i = 0; i < i_nMedias; i++ ) + { + VLMAWidget * vlmAwidget; + vlmItemCount = vlmItems.size(); + + QString mediaName = qfu( (*ppp_dsc)[i]->psz_name ); + /* It may have several inputs, we take the first one by default + - an evolution will be to manage these inputs in the gui */ + QString inputText = qfu( (*ppp_dsc)[i]->ppsz_input[0] ); + + QString outputText = qfu( (*ppp_dsc)[i]->psz_output ); + + /* Schedule media is a quite especial, maybe there is another way to grab information */ + if( (*ppp_dsc)[i]->b_vod ) + { + typeShortName = "VOD"; + QString mux = qfu( (*ppp_dsc)[i]->vod.psz_mux ); + vlmAwidget = new VLMVod( mediaName, inputText, inputOptions, + outputText, (*ppp_dsc)[i]->b_enabled, + mux, this ); + } + else + { + typeShortName = "Bcast"; + vlmAwidget = new VLMBroadcast( mediaName, inputText, inputOptions, + outputText, (*ppp_dsc)[i]->b_enabled, + (*ppp_dsc)[i]->broadcast.b_loop, this ); + } + /* Add an Item of the Side List */ + ui.vlmListItem->addItem( typeShortName + " : " + mediaName ); + ui.vlmListItem->setCurrentRow( vlmItemCount - 1 ); + + /* Add a new VLMAWidget on the main List */ + vlmItemLayout->insertWidget( vlmItemCount, vlmAwidget ); + vlmItems.append( vlmAwidget ); + clearWidgets(); + } + free( ppp_dsc ); + } +} + +bool VLMDialog::importVLMConf() +{ + QString openVLMConfFileName = toNativeSeparators( + QFileDialog::getOpenFileName( + this, qtr( "Open VLM configuration..." ), + QVLCUserDir( VLC_DOCUMENTS_DIR ), + qtr( "VLM conf (*.vlm);;All (*)" ) ) ); + + if( !openVLMConfFileName.isEmpty() ) + { + vlm_message_t *message; + int status; + QString command = "load \"" + openVLMConfFileName + "\""; + status = vlm_ExecuteCommand( p_vlm, qtu( command ) , &message ); + vlm_MessageDelete( message ); + if( status == 0 ) + { + mediasPopulator(); + } + else + { + msg_Warn( p_intf, "Failed to import vlm configuration file : %s", qtu( command ) ); + return false; + } + return true; + } + return false; } void VLMDialog::clearWidgets() { ui.nameLedit->clear(); ui.inputLedit->clear(); + inputOptions.clear(); ui.outputLedit->clear(); time->setTime( QTime::currentTime() ); date->setDate( QDate::currentDate() ); @@ -247,14 +381,15 @@ void VLMDialog::clearWidgets() void VLMDialog::selectInput() { - OpenDialog *o = OpenDialog::getInstance( this, p_intf, 0, true ); + OpenDialog *o = OpenDialog::getInstance( this, p_intf, false, SELECT, true ); o->exec(); - ui.inputLedit->setText( o->getMRL() ); + ui.inputLedit->setText( o->getMRL( false ) ); + inputOptions = o->getOptions(); } void VLMDialog::selectOutput() { - SoutDialog *s = SoutDialog::getInstance( this, p_intf, false ); + SoutDialog *s = new SoutDialog( this, p_intf ); if( s->exec() == QDialog::Accepted ) ui.outputLedit->setText( s->getMrl() ); } @@ -264,8 +399,6 @@ void VLMDialog::removeVLMItem( VLMAWidget *vlmObj ) { int index = vlmItems.indexOf( vlmObj ); if( index < 0 ) return; - - //FIXME, this is going to segfault if the focus in on the ListWidget delete ui.vlmListItem->takeItem( index ); vlmItems.removeAt( index ); delete vlmObj; @@ -278,7 +411,6 @@ void VLMDialog::startModifyVLMItem( VLMAWidget *vlmObj ) currentIndex = vlmItems.indexOf( vlmObj ); if( currentIndex < 0 ) return; - msg_Dbg( p_intf, "Type: %i", vlmObj->type ); ui.vlmListItem->setCurrentRow( currentIndex ); ui.nameLedit->setText( vlmObj->name ); ui.inputLedit->setText( vlmObj->input ); @@ -294,7 +426,8 @@ void VLMDialog::startModifyVLMItem( VLMAWidget *vlmObj ) ui.muxLedit->setText( (qobject_cast(vlmObj))->mux ); break; case QVLM_Schedule: - //(qobject_cast) + time->setDateTime( ( qobject_cast(vlmObj))->schetime ); + date->setDateTime( ( qobject_cast(vlmObj))->schedate ); break; } @@ -309,7 +442,7 @@ void VLMDialog::saveModifications() if( vlmObj ) { vlmObj->input = ui.inputLedit->text(); - vlmObj->output = ui.outputLedit->text(); + vlmObj->output = ui.outputLedit->text().remove( ":sout=" ); vlmObj->setChecked( ui.enableCheck->isChecked() ); vlmObj->b_enabled = ui.enableCheck->isChecked(); switch( vlmObj->type ) @@ -321,11 +454,14 @@ void VLMDialog::saveModifications() (qobject_cast(vlmObj))->mux = ui.muxLedit->text(); break; case QVLM_Schedule: + (qobject_cast(vlmObj))->schetime = time->dateTime(); + (qobject_cast(vlmObj))->schedate = date->dateTime(); + (qobject_cast(vlmObj))->rNumber = scherepeatnumber->value(); + (qobject_cast(vlmObj))->rDays = repeatDays->value(); break; // vlmObj-> } - vlmObj->update(); /* It should call the correct function is VLMAWidget - is abstract, but I am far from sure... FIXME ? */ + vlmObj->update(); } clearWidgets(); } @@ -334,17 +470,15 @@ void VLMDialog::saveModifications() * VLMAWidget - Abstract class ********************************/ -VLMAWidget::VLMAWidget( QString _name, - QString _input, - QString _output, - bool _enabled, - VLMDialog *_parent, - int _type ) +VLMAWidget::VLMAWidget( const QString& _name, const QString& _input, + const QString& _inputOptions, const QString& _output, + bool _enabled, VLMDialog *_parent, int _type ) : QGroupBox( _name, _parent ) { parent = _parent; name = _name; input = _input; + inputOptions = _inputOptions; output = _output; b_enabled = _enabled; type = _type; @@ -362,11 +496,11 @@ VLMAWidget::VLMAWidget( QString _name, objLayout->addWidget( time, 1, 3, 1, 2 );*/ QToolButton *modifyButton = new QToolButton; - modifyButton->setIcon( QIcon( QPixmap( ":/pixmaps/menus_settings_16px.png" ) ) ); + modifyButton->setIcon( QIcon( ":/menu/settings" ) ); objLayout->addWidget( modifyButton, 0, 5 ); QToolButton *deleteButton = new QToolButton; - deleteButton->setIcon( QIcon( QPixmap( ":/pixmaps/menus_quit_16px.png" ) ) ); + deleteButton->setIcon( QIcon( ":/menu/quit" ) ); objLayout->addWidget( deleteButton, 0, 6 ); BUTTONACT( modifyButton, modify() ); @@ -384,12 +518,6 @@ void VLMAWidget::del() parent->removeVLMItem( this ); } -//FIXME, remove me before release -void VLMAWidget::enterEvent( QEvent *event ) -{ - printf( "test" ); -} - void VLMAWidget::toggleEnabled( bool b_enable ) { VLMWrapper::EnableItem( name, b_enable ); @@ -398,22 +526,24 @@ void VLMAWidget::toggleEnabled( bool b_enable ) /**************** * VLMBroadcast ****************/ -VLMBroadcast::VLMBroadcast( QString _name, QString _input, QString _output, - bool _enabled, bool _looped, VLMDialog *_parent) - : VLMAWidget( _name, _input, _output, +VLMBroadcast::VLMBroadcast( const QString& _name, const QString& _input, + const QString& _inputOptions, + const QString& _output, bool _enabled, + bool _looped, VLMDialog *_parent ) + : VLMAWidget( _name, _input, _inputOptions, _output, _enabled, _parent, QVLM_Broadcast ) { - nameLabel->setText( "Broadcast: " + name ); + nameLabel->setText( qtr("Broadcast: ") + name ); type = QVLM_Broadcast; b_looped = _looped; playButton = new QToolButton; - playButton->setIcon( QIcon( QPixmap( ":/pixmaps/play_16px.png" ) ) ); + playButton->setIcon( QIcon( ":/menu/play" ) ); objLayout->addWidget( playButton, 1, 0 ); b_playing = true; QToolButton *stopButton = new QToolButton; - stopButton->setIcon( QIcon( QPixmap( ":/pixmaps/stop_16px.png" ) ) ); + stopButton->setIcon( QIcon( ":/toolbar/stop_b" ) ); objLayout->addWidget( stopButton, 1, 1 ); loopButton = new QToolButton; @@ -428,24 +558,24 @@ VLMBroadcast::VLMBroadcast( QString _name, QString _input, QString _output, void VLMBroadcast::update() { - VLMWrapper::EditBroadcast( name, input, output, b_enabled, b_looped ); + VLMWrapper::EditBroadcast( name, input, inputOptions, output, b_enabled, b_looped ); if( b_looped ) - loopButton->setIcon( QIcon( QPixmap( ":/pixmaps/playlist_repeat_all.png" ) ) ); + loopButton->setIcon( QIcon( ":/buttons/playlist/repeat_all" ) ); else - loopButton->setIcon( QIcon( QPixmap( ":/pixmaps/playlist_repeat_off.png" ) ) ); + loopButton->setIcon( QIcon( ":/buttons/playlist/repeat_off" ) ); } void VLMBroadcast::togglePlayPause() { - if( b_playing = true ) + if( b_playing ) { VLMWrapper::ControlBroadcast( name, ControlBroadcastPause ); - playButton->setIcon( QIcon( QPixmap( ":/pixmaps/pause_16px.png" ) ) ); + playButton->setIcon( QIcon( ":/menu/pause" ) ); } else { VLMWrapper::ControlBroadcast( name, ControlBroadcastPlay ); - playButton->setIcon( QIcon( QPixmap( ":/pixmaps/play_16px.png" ) ) ); + playButton->setIcon( QIcon( ":/menu/play" ) ); } b_playing = !b_playing; } @@ -459,31 +589,45 @@ void VLMBroadcast::toggleLoop() void VLMBroadcast::stop() { VLMWrapper::ControlBroadcast( name, ControlBroadcastStop ); - playButton->setIcon( QIcon( QPixmap( ":/pixmaps/play_16px.png" ) ) ); + playButton->setIcon( QIcon( ":/menu/play" ) ); } /**************** * VLMSchedule ****************/ -VLMSchedule::VLMSchedule( QString name, QString input, QString output, - bool enabled, VLMDialog *parent) - : VLMAWidget( name, input, output, enabled, parent, QVLM_Schedule ) -{ - nameLabel->setText( "Schedule: " + name ); +VLMSchedule::VLMSchedule( const QString& name, const QString& input, + const QString& inputOptions, + const QString& output, QDateTime _schetime, + QDateTime _schedate, int _scherepeatnumber, + int _repeatDays, bool enabled, VLMDialog *parent ) + : VLMAWidget( name, input, inputOptions, output, enabled, parent, + QVLM_Schedule ) +{ + nameLabel->setText( qtr("Schedule: ") + name ); + schetime = _schetime; + schedate = _schedate; + rNumber = _scherepeatnumber; + rDays = _repeatDays; + type = QVLM_Schedule; + update(); } void VLMSchedule::update() { + VLMWrapper::EditSchedule( name, input, inputOptions, output, schetime, schedate, + rNumber, rDays, b_enabled); } /**************** * VLMVOD ****************/ -VLMVod::VLMVod( QString name, QString input, QString output, - bool enabled, QString _mux, VLMDialog *parent) - : VLMAWidget( name, input, output, enabled, parent, QVLM_VOD ) +VLMVod::VLMVod( const QString& name, const QString& input, + const QString& inputOptions, const QString& output, + bool enabled, const QString& _mux, VLMDialog *parent) + : VLMAWidget( name, input, inputOptions, output, enabled, parent, + QVLM_VOD ) { - nameLabel->setText( "VOD:" + name ); + nameLabel->setText( qtr("VOD: ") + name ); mux = _mux; muxLabel = new QLabel; @@ -495,7 +639,7 @@ VLMVod::VLMVod( QString name, QString input, QString output, void VLMVod::update() { muxLabel->setText( mux ); - VLMWrapper::EditVod( name, input, output, b_enabled, mux ); + VLMWrapper::EditVod( name, input, inputOptions, output, b_enabled, mux ); } @@ -510,21 +654,23 @@ VLMWrapper::VLMWrapper( vlm_t *_p_vlm ) } VLMWrapper::~VLMWrapper() -{} +{ + p_vlm = NULL; +} -void VLMWrapper::AddBroadcast( const QString name, QString input, - QString output, +void VLMWrapper::AddBroadcast( const QString& name, const QString& input, + const QString& inputOptions, const QString& output, bool b_enabled, bool b_loop ) { vlm_message_t *message; QString command = "new \"" + name + "\" broadcast"; vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); vlm_MessageDelete( message ); - EditBroadcast( name, input, output, b_enabled, b_loop ); + EditBroadcast( name, input, inputOptions, output, b_enabled, b_loop ); } -void VLMWrapper::EditBroadcast( const QString name, const QString input, - const QString output, +void VLMWrapper::EditBroadcast( const QString& name, const QString& input, + const QString& inputOptions, const QString& output, bool b_enabled, bool b_loop ) { vlm_message_t *message; @@ -533,9 +679,22 @@ 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() ) + { + command = "setup \"" + name + "\" input \"" + input + "\""; + vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); + vlm_MessageDelete( message ); + + QStringList options = inputOptions.split( " :", QString::SkipEmptyParts ); + for( int i = 0; i < options.size(); i++ ) + { + command = "setup \"" + name + "\" option \"" + options[i].trimmed() + "\""; + vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); + vlm_MessageDelete( message ); + } + } + if( !output.isEmpty() ) { command = "setup \"" + name + "\" output \"" + output + "\""; @@ -556,18 +715,20 @@ void VLMWrapper::EditBroadcast( const QString name, const QString input, } } -void VLMWrapper::EnableItem( const QString name, bool b_enable ) +void VLMWrapper::EnableItem( const QString& name, bool b_enable ) { vlm_message_t *message; QString command = "setup \"" + name + ( b_enable ? " enable" : " disable" ); + vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); + vlm_MessageDelete( message ); } -void VLMWrapper::ControlBroadcast( const QString name, int BroadcastStatus, +void VLMWrapper::ControlBroadcast( const QString& name, int BroadcastStatus, unsigned int seek ) { vlm_message_t *message; - QString command = "control \"" + name; + QString command = "control \"" + name + "\""; switch( BroadcastStatus ) { case ControlBroadcastPlay: @@ -587,44 +748,155 @@ void VLMWrapper::ControlBroadcast( const QString name, int BroadcastStatus, vlm_MessageDelete( message ); } -void VLMWrapper::AddVod( const QString name, const QString input, - const QString output, - bool b_enabled, const QString mux ) +void VLMWrapper::AddVod( const QString& name, const QString& input, + const QString& inputOptions, const QString& output, + bool b_enabled, const QString& mux ) { vlm_message_t *message; QString command = "new \"" + name + "\" vod"; vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); vlm_MessageDelete( message ); - EditVod( name, input, output, b_enabled, mux ); + EditVod( name, input, inputOptions, output, b_enabled, mux ); } -void VLMWrapper::EditVod( const QString name, const QString input, - const QString output, +void VLMWrapper::EditVod( const QString& name, const QString& input, + const QString& inputOptions, const QString& output, bool b_enabled, - const QString mux ) + const QString& mux ) { vlm_message_t *message; - QString command = "setup \"" + name + "\" input \"" + input + "\""; + QString command; + + if( !input.isEmpty() ) + { + command = "setup \"" + name + "\" input \"" + input + "\""; + vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); + vlm_MessageDelete( message ); + + QStringList options = inputOptions.split( " :", QString::SkipEmptyParts ); + for( int i = 0; i < options.size(); i++ ) + { + command = "setup \"" + name + "\" option \"" + options[i].trimmed() + "\""; + vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); + vlm_MessageDelete( message ); + } + } + + if( !output.isEmpty() ) + { + command = "setup \"" + name + "\" output \"" + output + "\""; + vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); + vlm_MessageDelete( message ); + } + + if( b_enabled ) + { + command = "setup \"" + name + "\" enabled"; + vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); + vlm_MessageDelete( message ); + } + if( !mux.isEmpty() ) + { + command = "setup \"" + name + "\" mux \"" + mux + "\""; + vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); + vlm_MessageDelete( message ); + } +} + +void VLMWrapper::AddSchedule( const QString& name, const QString& input, + const QString& inputOptions, const QString& output, + QDateTime _schetime, QDateTime _schedate, + int _scherepeatnumber, int _repeatDays, + bool b_enabled, const QString& mux ) +{ + vlm_message_t *message; + QString command = "new \"" + name + "\" schedule"; vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); vlm_MessageDelete( message ); + EditSchedule( name, input, inputOptions, output, _schetime, _schedate, + _scherepeatnumber, _repeatDays, b_enabled, mux ); +} + +void VLMWrapper::EditSchedule( const QString& name, const QString& input, + const QString& inputOptions, const QString& output, + QDateTime _schetime, QDateTime _schedate, + int _scherepeatnumber, int _repeatDays, + bool b_enabled, const QString& mux ) +{ + vlm_message_t *message; + QString command; + + if( !input.isEmpty() ) + { + command = "setup \"" + name + "\" input \"" + input + "\""; + vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); + vlm_MessageDelete( message ); + + QStringList options = inputOptions.split( " :", QString::SkipEmptyParts ); + for( int i = 0; i < options.size(); i++ ) + { + command = "setup \"" + name + "\" option \"" + options[i].trimmed() + "\""; + vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); + vlm_MessageDelete( message ); + } + } + if( !output.isEmpty() ) { command = "setup \"" + name + "\" output \"" + output + "\""; vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); vlm_MessageDelete( message ); } + if( b_enabled ) { command = "setup \"" + name + "\" enabled"; vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); vlm_MessageDelete( message ); } + if( !mux.isEmpty() ) { command = "setup \"" + name + "\" mux \"" + mux + "\""; vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); vlm_MessageDelete( message ); } + + command = "setup \"" + name + "\" date \"" + + _schedate.toString( "yyyy/MM/dd" )+ "-" + + _schetime.toString( "hh:mm:ss" ) + "\""; + vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); + vlm_MessageDelete( message ); + + if( _scherepeatnumber > 0 ) + { + command = "setup \"" + name + "\" repeat \"" + _scherepeatnumber + "\""; + vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); + vlm_MessageDelete( message ); + } + + if( _repeatDays > 0 ) + { + command = "setup \"" + name + "\" period \"" + _repeatDays + "\""; + vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); + vlm_MessageDelete( message ); + } +} + +void VLMDialog::toggleVisible() +{ + QList::iterator it; + for( it = vlmItems.begin(); it != vlmItems.end(); it++ ) + { + VLMAWidget *item = *it; + delete item; + item = NULL; + } + vlmItems.clear(); + ui.vlmListItem->clear(); + mediasPopulator(); + QVLCDialog::toggleVisible(); } + #endif