Commit 95b46803 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Qt4 - IM. simplification again, since emit inputChanged() calls setInput.

parent 70304d68
...@@ -399,12 +399,13 @@ void InputManager::setRate( int new_rate ) ...@@ -399,12 +399,13 @@ void InputManager::setRate( int new_rate )
**********************************************************************/ **********************************************************************/
MainInputManager * MainInputManager::instance = NULL; MainInputManager * MainInputManager::instance = NULL;
MainInputManager::MainInputManager( intf_thread_t *_p_intf ) : QObject(NULL), MainInputManager::MainInputManager( intf_thread_t *_p_intf )
p_intf( _p_intf ) : QObject(NULL), p_intf( _p_intf )
{ {
p_input = NULL; p_input = NULL;
im = new InputManager( this, p_intf ); im = new InputManager( this, p_intf );
// No necessary, I think
//var_AddCallback( THEPL, "intf-change", ItemChanged, im ); //var_AddCallback( THEPL, "intf-change", ItemChanged, im );
//var_AddCallback( THEPL, "playlist-current", ItemChanged, im ); //var_AddCallback( THEPL, "playlist-current", ItemChanged, im );
...@@ -465,7 +466,6 @@ void MainInputManager::customEvent( QEvent *event ) ...@@ -465,7 +466,6 @@ void MainInputManager::customEvent( QEvent *event )
p_input = THEPL->p_input; p_input = THEPL->p_input;
if( p_input && !( p_input->b_die || p_input->b_dead) ) if( p_input && !( p_input->b_die || p_input->b_dead) )
{ {
im->setInput( p_input );
emit inputChanged( p_input ); emit inputChanged( p_input );
} }
else else
...@@ -482,12 +482,12 @@ void MainInputManager::customEvent( QEvent *event ) ...@@ -482,12 +482,12 @@ void MainInputManager::customEvent( QEvent *event )
if( p_playlist ) if( p_playlist )
{ {
p_input = p_playlist->p_input; p_input = p_playlist->p_input;
vlc_object_yield( p_input );
emit inputChanged( p_input ); emit inputChanged( p_input );
} }
} }
} }
/* Playlist Control functions */
void MainInputManager::stop() void MainInputManager::stop()
{ {
playlist_Stop( THEPL ); playlist_Stop( THEPL );
......
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