/* 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 );
new QSpacerItem( 10, 10, QSizePolicy::Minimum, QSizePolicy::Expanding);
vlmItemLayout->addItem( spacer );
- QPushButton *importButton = new QPushButton( qtr( "Import" ) );
+ 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" ) );
+ QPushButton *closeButton = new QPushButton( qtr( "&Close" ) );
ui.buttonBox->addButton( closeButton, QDialogButtonBox::AcceptRole );
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 )
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;
}
{
QString saveVLMConfFileName = QFileDialog::getSaveFileName(
this, qtr( "Choose a filename to save the VLM configuration..." ),
- qfu( p_intf->p_libvlc->psz_homedir ),
+ qfu( config_GetHomeDir() ),
qtr( "VLM conf (*.vlm) ;; All (*.*)" ) );
if( !saveVLMConfFileName.isEmpty() )
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( "Choose a VLM configuration file to open..." ),
- qfu( p_intf->p_libvlc->psz_homedir ),
+ 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 + "\"";
- vlm_ExecuteCommand( p_vlm, qtu( command ) , &message );
+ 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::selectInput()
{
- OpenDialog *o = OpenDialog::getInstance( this, p_intf, SELECT, true );
+ OpenDialog *o = OpenDialog::getInstance( this, p_intf, false, SELECT, true );
o->exec();
ui.inputLedit->setText( o->getMRL() );
}
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 );
}
VLMWrapper::~VLMWrapper()
-{}
+{
+ p_vlm = NULL;
+}
void VLMWrapper::AddBroadcast( const QString name, QString input,
QString output,
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";
projects / vlc / blobdiff