Commit ad74fb3b authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt4 - Cleanups, simplifications. Public=>Private for slots.

parent 42e7ea08
...@@ -204,7 +204,7 @@ void MediaInfoDialog::close() ...@@ -204,7 +204,7 @@ void MediaInfoDialog::close()
MP->setEditMode( false ); MP->setEditMode( false );
} }
void MediaInfoDialog::( int i_tab ) void MediaInfoDialog::updateButtons( int i_tab )
{ {
if( MP->isInEditMode() && i_tab == 0 ) if( MP->isInEditMode() && i_tab == 0 )
saveMetaButton->show(); saveMetaButton->show();
......
...@@ -27,6 +27,7 @@ PodcastConfigurationDialog::PodcastConfigurationDialog( intf_thread_t *_p_intf ) ...@@ -27,6 +27,7 @@ PodcastConfigurationDialog::PodcastConfigurationDialog( intf_thread_t *_p_intf )
:p_intf( _p_intf ) :p_intf( _p_intf )
{ {
ui.setupUi( this ); ui.setupUi( this );
QPushButton *okButton = new QPushButton( qtr( "OK" ), this ); QPushButton *okButton = new QPushButton( qtr( "OK" ), this );
QPushButton *cancelButton = new QPushButton( qtr( "Cancel" ), this ); QPushButton *cancelButton = new QPushButton( qtr( "Cancel" ), this );
ui.okCancel->addButton( okButton, QDialogButtonBox::AcceptRole ); ui.okCancel->addButton( okButton, QDialogButtonBox::AcceptRole );
......
...@@ -133,7 +133,7 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf, ...@@ -133,7 +133,7 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf,
QString SoutDialog::getMrl() QString SoutDialog::getMrl()
{ {
return this->mrl; return mrl;
} }
void SoutDialog::fileBrowse() void SoutDialog::fileBrowse()
......
...@@ -43,20 +43,23 @@ public: ...@@ -43,20 +43,23 @@ public:
bool _transcode_only = false ); bool _transcode_only = false );
virtual ~SoutDialog() {} virtual ~SoutDialog() {}
QString getMrl(); QString getMrl();
QString mrl;
//sout_gui_descr_t *sout; //sout_gui_descr_t *sout;
private: private:
Ui::Sout ui; Ui::Sout ui;
QPushButton *okButton; QPushButton *okButton;
QString mrl;
bool b_transcode_only; bool b_transcode_only;
public slots: public slots:
void updateMRL();
private slots:
void ok(); void ok();
void cancel(); void cancel();
void updateMRL();
void fileBrowse();
void toggleSout(); void toggleSout();
void setOptions(); void setOptions();
void fileBrowse();
void setVTranscodeOptions( bool ); void setVTranscodeOptions( bool );
void setATranscodeOptions( bool ); void setATranscodeOptions( bool );
void setSTranscodeOptions( bool ); void setSTranscodeOptions( bool );
......
...@@ -396,11 +396,11 @@ void DialogsProvider::streamingDialog( QString mrl, bool b_transcode_only ) ...@@ -396,11 +396,11 @@ void DialogsProvider::streamingDialog( QString mrl, bool b_transcode_only )
b_transcode_only ); b_transcode_only );
if( s->exec() == QDialog::Accepted ) if( s->exec() == QDialog::Accepted )
{ {
msg_Err(p_intf, "mrl %s\n", qta(s->mrl)); msg_Err( p_intf, "mrl %s\n", qta( s->getMrl() ) );
/* Just do it */ /* Just do it */
int i_len = strlen( qtu(s->mrl) ) + 10; int i_len = strlen( qtu( s->getMrl() ) ) + 10;
char *psz_option = (char*)malloc(i_len); char *psz_option = (char*)malloc(i_len);
snprintf( psz_option, i_len - 1, "%s", qtu(s->mrl)); snprintf( psz_option, i_len - 1, "%s", qtu( s->getMrl() ) );
playlist_AddExt( THEPL, qtu( mrl ), "Streaming", playlist_AddExt( THEPL, qtu( mrl ), "Streaming",
PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END, PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END,
......
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