X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fgui%2Fqt4%2Fdialogs%2Fvlm.cpp;h=12ad9bf4e4411750dd8266dee0557cd307bea3e4;hb=d0389324b91b56a96bc6bbcb2c417ca824a892ab;hp=db76bfa0db11a971227b3d46d32f42777681b3d5;hpb=f7ab4a97629e4cc61fb2e77bfd0df720e6a3d1e6;p=vlc diff --git a/modules/gui/qt4/dialogs/vlm.cpp b/modules/gui/qt4/dialogs/vlm.cpp index db76bfa0db..12ad9bf4e4 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,8 +23,16 @@ * Foundation, Inc., 51 Franklin street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include "dialogs/vlm.hpp" +#ifdef ENABLE_VLM +#include "dialogs/open.hpp" +#include "dialogs/sout.hpp" + #include #include #include @@ -39,22 +47,24 @@ #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( QWidget *parent, intf_thread_t *_p_intf ) : QVLCDialog( parent, _p_intf ) +{ p_vlm = vlm_New( p_intf ); if( !p_vlm ) { msg_Warn( p_intf, "Couldn't build VLM object "); - return; + return; } vlmWrapper = new VLMWrapper( p_vlm ); @@ -70,9 +80,9 @@ VLMDialog::VLMDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) /* 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 ); @@ -81,6 +91,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() ); @@ -119,9 +130,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( "Import" ) ); + ui.buttonBox->addButton( importButton, QDialogButtonBox::ActionRole ); + + QPushButton *exportButton = new QPushButton( qtr( "Export" ) ); + 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 */ @@ -133,17 +151,25 @@ 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() ); } VLMDialog::~VLMDialog() { + delete vlmWrapper; + /* FIXME :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 ) @@ -155,7 +181,8 @@ 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 ) @@ -176,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; } @@ -187,7 +214,10 @@ 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; switch( type ) @@ -195,8 +225,9 @@ void VLMDialog::addVLMItem() 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 ); + b_checked, b_looped, this ); + VLMWrapper::AddBroadcast( name, inputText, outputText, b_checked, + b_looped ); break; case QVLM_VOD: typeShortName = "VOD"; @@ -207,7 +238,10 @@ void VLMDialog::addVLMItem() case QVLM_Schedule: typeShortName = "Sched"; vlmAwidget = new VLMSchedule( name, inputText, outputText, - b_checked, this ); + schetime, schedate, repeatnum, + repeatdays, b_checked, this ); + VLMWrapper::AddSchedule( name, inputText, outputText, schetime, + schedate, repeatnum, repeatdays, b_checked); break; default: msg_Warn( p_intf, "Something bad happened" ); @@ -222,8 +256,106 @@ void VLMDialog::addVLMItem() vlmItemLayout->insertWidget( vlmItemCount, vlmAwidget ); vlmItems.append( vlmAwidget ); + clearWidgets(); +} - /* HERE BE DRAGONS VLM REQUEST */ +// FIXME : VOD are not exported to the file +bool VLMDialog::exportVLMConf() +{ + QString saveVLMConfFileName = QFileDialog::getSaveFileName( + this, qtr( "Choose a filename to save the VLM configuration..." ), + qfu( config_GetHomeDir() ), + 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 informations 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 informations */ + if( (*ppp_dsc)[i]->b_vod ) + { + typeShortName = "VOD"; + QString mux = qfu( (*ppp_dsc)[i]->vod.psz_mux ); + vlmAwidget = new VLMVod( mediaName, inputText, outputText, + (*ppp_dsc)[i]->b_enabled, mux, this ); + } + else + { + typeShortName = "Bcast"; + vlmAwidget = new VLMBroadcast( mediaName, inputText, 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 = QFileDialog::getOpenFileName( + this, qtr( "Open a VLM Configuration File" ), + qfu( config_GetHomeDir() ), + 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() @@ -241,13 +373,25 @@ void VLMDialog::clearWidgets() ui.addButton->show(); } +void VLMDialog::selectInput() +{ + OpenDialog *o = OpenDialog::getInstance( this, p_intf, false, SELECT, true ); + o->exec(); + ui.inputLedit->setText( o->getMRL() ); +} + +void VLMDialog::selectOutput() +{ + SoutDialog *s = SoutDialog::getInstance( this, p_intf, false ); + if( s->exec() == QDialog::Accepted ) + ui.outputLedit->setText( s->getMrl() ); +} + /* Object Modification */ 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; @@ -260,7 +404,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 ); @@ -276,7 +419,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; } @@ -303,6 +447,10 @@ 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-> } @@ -378,7 +526,7 @@ void VLMAWidget::toggleEnabled( bool b_enable ) } /**************** - * VLMBroadcast + * VLMBroadcast ****************/ VLMBroadcast::VLMBroadcast( QString _name, QString _input, QString _output, bool _enabled, bool _looped, VLMDialog *_parent) @@ -404,7 +552,7 @@ VLMBroadcast::VLMBroadcast( QString _name, QString _input, QString _output, BUTTONACT( playButton, togglePlayPause() ); BUTTONACT( stopButton, stop() ); BUTTONACT( loopButton, toggleLoop() ); - + update(); } @@ -448,14 +596,24 @@ void VLMBroadcast::stop() * VLMSchedule ****************/ VLMSchedule::VLMSchedule( QString name, QString input, QString output, - bool enabled, VLMDialog *parent) + QDateTime _schetime, QDateTime _schedate, + int _scherepeatnumber, int _repeatDays, + bool enabled, VLMDialog *parent ) : VLMAWidget( name, input, output, enabled, parent, QVLM_Schedule ) { nameLabel->setText( "Schedule: " + name ); + schetime = _schetime; + schedate = _schedate; + rNumber = _scherepeatnumber; + rDays = _repeatDays; + type = QVLM_Schedule; + update(); } void VLMSchedule::update() { + VLMWrapper::EditSchedule( name, input, output, schetime, schedate, + rNumber, rDays, b_enabled); } /**************** @@ -470,7 +628,7 @@ VLMVod::VLMVod( QString name, QString input, QString output, mux = _mux; muxLabel = new QLabel; objLayout->addWidget( muxLabel, 1, 0 ); - + update(); } @@ -492,7 +650,9 @@ VLMWrapper::VLMWrapper( vlm_t *_p_vlm ) } VLMWrapper::~VLMWrapper() -{} +{ + p_vlm = NULL; +} void VLMWrapper::AddBroadcast( const QString name, QString input, QString output, @@ -511,7 +671,7 @@ void VLMWrapper::EditBroadcast( const QString name, const QString input, { vlm_message_t *message; QString command; - + command = "setup \"" + name + "\" inputdel all"; vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); vlm_MessageDelete( message ); @@ -544,7 +704,7 @@ void VLMWrapper::EnableItem( const QString name, bool b_enable ) QString command = "setup \"" + name + ( b_enable ? " enable" : " disable" ); } -void VLMWrapper::ControlBroadcast( const QString name, int BroadcastStatus, +void VLMWrapper::ControlBroadcast( const QString name, int BroadcastStatus, unsigned int seek ) { vlm_message_t *message; @@ -581,7 +741,7 @@ void VLMWrapper::AddVod( const QString name, const QString input, } void VLMWrapper::EditVod( const QString name, const QString input, - const QString output, + const QString output, bool b_enabled, const QString mux ) { @@ -589,22 +749,86 @@ void VLMWrapper::EditVod( const QString name, const QString input, QString command = "setup \"" + name + "\" input \"" + input + "\""; 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 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, output, _schetime, _schedate, + _scherepeatnumber, _repeatDays, b_enabled, mux ); +} + +void VLMWrapper::EditSchedule( const QString name, const QString input, + const QString output, QDateTime _schetime, + QDateTime _schedate, int _scherepeatnumber, + int _repeatDays, bool b_enabled, + const QString mux ) +{ + vlm_message_t *message; + QString command = "setup \"" + name + "\" input \"" + input + "\""; + 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 ); + } } + + +#endif