Commit 8d6cfafb authored by Jonathan Calmels's avatar Jonathan Calmels Committed by Jean-Baptiste Kempf

Qt: inputChanged signal now takes the input_thread_t as parameter

Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent 0c59f960
......@@ -493,7 +493,7 @@ SpeedLabel::SpeedLabel( intf_thread_t *_p_intf, QWidget *parent )
/* Change the SpeedRate in the Label */
CONNECT( THEMIM->getIM(), rateChanged( float ), this, setRate( float ) );
DCONNECT( THEMIM, inputChanged( ),
DCONNECT( THEMIM, inputChanged( input_thread_t * ),
speedControl, activateOnState() );
setContentsMargins(4, 0, 4, 0);
......
......@@ -59,7 +59,7 @@ PLModel::PLModel( playlist_t *_p_playlist, /* THEPL */
rebuild( p_root );
DCONNECT( THEMIM->getIM(), metaChanged( input_item_t *),
this, processInputItemUpdate( input_item_t *) );
DCONNECT( THEMIM, inputChanged( ),
DCONNECT( THEMIM, inputChanged( input_thread_t * ),
this, processInputItemUpdate( ) );
CONNECT( THEMIM, playlistItemAppended( int, int ),
this, processItemAppend( int, int ) );
......
......@@ -49,7 +49,7 @@ ExtensionsManager::ExtensionsManager( intf_thread_t *_p_intf, QObject *parent )
menuMapper = new QSignalMapper( this );
CONNECT( menuMapper, mapped( int ), this, triggerMenu( int ) );
CONNECT( THEMIM->getIM(), playingStatusChanged( int ), this, playingChanged( int ) );
DCONNECT( THEMIM, inputChanged( ),
DCONNECT( THEMIM, inputChanged( input_thread_t * ),
this, inputChanged( ) );
CONNECT( THEMIM->getIM(), metaChanged( input_item_t* ),
this, metaChanged( input_item_t* ) );
......
......@@ -1023,13 +1023,13 @@ MainInputManager::MainInputManager( intf_thread_t *_p_intf )
mute.addCallback( this, SLOT(notifyMute(bool)) );
/* Warn our embedded IM about input changes */
DCONNECT( this, inputChanged(),
DCONNECT( this, inputChanged( input_thread_t * ),
im, inputChangedHandler() );
/* initialize p_input (an input can already be running) */
p_input = playlist_CurrentInput( THEPL );
if( p_input )
emit inputChanged( );
emit inputChanged( p_input );
/* Audio Menu */
menusAudioMapper = new QSignalMapper();
......@@ -1042,7 +1042,7 @@ MainInputManager::~MainInputManager()
{
vlc_object_release( p_input );
p_input = NULL;
emit inputChanged( );
emit inputChanged( NULL );
}
var_DelCallback( THEPL, "activity", PLItemChanged, this );
......@@ -1097,7 +1097,7 @@ void MainInputManager::customEvent( QEvent *event )
if( p_input != NULL )
vlc_object_release( p_input );
p_input = playlist_CurrentInput( THEPL );
emit inputChanged( );
emit inputChanged( p_input );
}
/* Playlist Control functions */
......
......@@ -314,7 +314,7 @@ private slots:
void menusUpdateAudio( const QString& );
signals:
void inputChanged( );
void inputChanged( input_thread_t * );
void volumeChanged( float );
void soundMuteChanged( bool );
void playlistItemAppended( int itemId, int parentId );
......
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