Commit 627feeb6 authored by Jakub Wieczorek's avatar Jakub Wieczorek Committed by Jean-Baptiste Kempf

InputManager: Rename the status property to playingStatus and add a getter.

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 75a0c9e1
...@@ -67,7 +67,7 @@ AbstractController::AbstractController( intf_thread_t * _p_i, QWidget *_parent ) ...@@ -67,7 +67,7 @@ AbstractController::AbstractController( intf_thread_t * _p_i, QWidget *_parent )
toolbarActionsMapper = new QSignalMapper( this ); toolbarActionsMapper = new QSignalMapper( this );
CONNECT( toolbarActionsMapper, mapped( int ), CONNECT( toolbarActionsMapper, mapped( int ),
ActionsManager::getInstance( p_intf ), doAction( int ) ); ActionsManager::getInstance( p_intf ), doAction( int ) );
CONNECT( THEMIM->getIM(), statusChanged( int ), this, setStatus( int ) ); CONNECT( THEMIM->getIM(), playingStatusChanged( int ), this, setStatus( int ) );
setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Fixed ); setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Fixed );
} }
......
...@@ -111,7 +111,7 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf ) ...@@ -111,7 +111,7 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
move ( 450 , 0 ); move ( 450 , 0 );
} }
CONNECT( THEMIM->getIM(), statusChanged( int ), this, changedItem( int ) ); CONNECT( THEMIM->getIM(), playingStatusChanged( int ), this, changedItem( int ) );
} }
ExtendedDialog::~ExtendedDialog() ExtendedDialog::~ExtendedDialog()
......
...@@ -48,7 +48,7 @@ ExtensionsManager::ExtensionsManager( intf_thread_t *_p_intf, QObject *parent ) ...@@ -48,7 +48,7 @@ ExtensionsManager::ExtensionsManager( intf_thread_t *_p_intf, QObject *parent )
menuMapper = new QSignalMapper( this ); menuMapper = new QSignalMapper( this );
CONNECT( menuMapper, mapped( int ), this, triggerMenu( int ) ); CONNECT( menuMapper, mapped( int ), this, triggerMenu( int ) );
CONNECT( THEMIM->getIM(), statusChanged( int ), this, playingChanged( int ) ); CONNECT( THEMIM->getIM(), playingStatusChanged( int ), this, playingChanged( int ) );
DCONNECT( THEMIM, inputChanged( input_thread_t* ), DCONNECT( THEMIM, inputChanged( input_thread_t* ),
this, inputChanged( input_thread_t* ) ); this, inputChanged( input_thread_t* ) );
b_unloading = false; b_unloading = false;
......
...@@ -157,7 +157,7 @@ void InputManager::delInput() ...@@ -157,7 +157,7 @@ void InputManager::delInput()
emit nameChanged( "" ); emit nameChanged( "" );
emit chapterChanged( 0 ); emit chapterChanged( 0 );
emit titleChanged( 0 ); emit titleChanged( 0 );
emit statusChanged( END_S ); emit playingStatusChanged( END_S );
emit teletextPossible( false ); emit teletextPossible( false );
emit AtoBchanged( false, false ); emit AtoBchanged( false, false );
...@@ -436,7 +436,7 @@ void InputManager::UpdateStatus() ...@@ -436,7 +436,7 @@ void InputManager::UpdateStatus()
if( i_old_playing_status != state ) if( i_old_playing_status != state )
{ {
i_old_playing_status = state; i_old_playing_status = state;
emit statusChanged( state ); emit playingStatusChanged( state );
} }
} }
...@@ -498,6 +498,11 @@ void InputManager::UpdateName() ...@@ -498,6 +498,11 @@ void InputManager::UpdateName()
} }
} }
int InputManager::playingStatus()
{
return i_old_playing_status;
}
bool InputManager::hasAudio() bool InputManager::hasAudio()
{ {
if( hasInput() ) if( hasInput() )
......
...@@ -130,6 +130,7 @@ public: ...@@ -130,6 +130,7 @@ public:
&& vlc_object_alive (p_input); /* and the VLC object is alive */ && vlc_object_alive (p_input); /* and the VLC object is alive */
} }
int playingStatus();
bool hasAudio(); bool hasAudio();
bool hasVideo() { return hasInput() && b_video; } bool hasVideo() { return hasInput() && b_video; }
void requestArtUpdate(); void requestArtUpdate();
...@@ -218,7 +219,7 @@ signals: ...@@ -218,7 +219,7 @@ signals:
void metaChanged( input_item_t *); void metaChanged( input_item_t *);
void artChanged( QString ); void artChanged( QString );
/// Play/pause status /// Play/pause status
void statusChanged( int ); void playingStatusChanged( int );
void recordingStateChanged( bool ); void recordingStateChanged( bool );
/// Teletext /// Teletext
void teletextPossible( bool ); void teletextPossible( bool );
......
...@@ -193,7 +193,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) ...@@ -193,7 +193,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
#ifndef HAVE_MAEMO #ifndef HAVE_MAEMO
if( sysTray ) if( sysTray )
{ {
CONNECT( THEMIM->getIM(), statusChanged( int ), CONNECT( THEMIM->getIM(), playingStatusChanged( int ),
this, updateSystrayTooltipStatus( int ) ); this, updateSystrayTooltipStatus( int ) );
} }
#endif #endif
......
...@@ -142,7 +142,7 @@ void MainInterface::createTaskBarButtons() ...@@ -142,7 +142,7 @@ void MainInterface::createTaskBarButtons()
if(S_OK != hr) if(S_OK != hr)
msg_Err( p_intf, "ThumbBarAddButtons failed with error %08x", hr ); msg_Err( p_intf, "ThumbBarAddButtons failed with error %08x", hr );
} }
CONNECT( THEMIM->getIM(), statusChanged( int ), this, changeThumbbarButtons( int ) ); CONNECT( THEMIM->getIM(), playingStatusChanged( int ), this, changeThumbbarButtons( int ) );
} }
else else
{ {
......
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