Commit fc63146c authored by Rafaël Carré's avatar Rafaël Carré

Adds a pause pixmap for the play/pause button

Fix play/pause toggle
Removes 2 unused signals
parent 2cc0e51d
...@@ -586,19 +586,12 @@ void ControlsWidget::updateOnTimer() ...@@ -586,19 +586,12 @@ void ControlsWidget::updateOnTimer()
enableVideo( THEMIM->getIM()->hasVideo() ); enableVideo( THEMIM->getIM()->hasVideo() );
} }
/* FIXME */
void ControlsWidget::setStatus( int status ) void ControlsWidget::setStatus( int status )
{ {
if( status == 1 ) // Playing if( status == PLAYING_S ) // Playing
{ playButton->setIcon( QIcon( ":/pixmaps/pause.png" ) );
msg_Dbg( p_intf, "I was here %i", status );
// playButton->setIcon( QIcon( ":/pixmaps/pause.png" ) );
}
else else
{ playButton->setIcon( QIcon( ":/pixmaps/play.png" ) );
msg_Dbg( p_intf, "I was here %i", status );
// playButton->setIcon( QIcon( ":/pixmaps/play.png" ) );
}
} }
/** /**
......
...@@ -88,16 +88,11 @@ void InputManager::update() ...@@ -88,16 +88,11 @@ void InputManager::update()
emit positionUpdated( 0.0, 0, 0 ); emit positionUpdated( 0.0, 0, 0 );
emit navigationChanged( 0 ); emit navigationChanged( 0 );
i_old_playing_status = 0; i_old_playing_status = 0;
emit statusChanged( 0 ); // 0 = STOPPED, 1 = PLAY, 2 = PAUSE emit statusChanged( END_S ); // see vlc_input.h, input_state_e enum
delInput(); delInput();
return; return;
} }
if( !b_had_audio && b_has_audio )
emit audioStarted();
if( !b_had_video && b_has_video )
emit videoStarted();
/* Update position */ /* Update position */
mtime_t i_length, i_time; mtime_t i_length, i_time;
float f_pos; float f_pos;
......
...@@ -65,8 +65,6 @@ signals: ...@@ -65,8 +65,6 @@ signals:
void navigationChanged( int ); void navigationChanged( int );
/// Play/pause status /// Play/pause status
void statusChanged( int ); void statusChanged( int );
void audioStarted();
void videoStarted();
}; };
class MainInputManager : public QObject class MainInputManager : public QObject
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<RCC version="1.0"> <RCC version="1.0">
<qresource> <qresource>
<file>pixmaps/play.png</file> <file>pixmaps/play.png</file>
<file>pixmaps/pause.png</file>
<file>pixmaps/stop.png</file> <file>pixmaps/stop.png</file>
<file>pixmaps/previous.png</file> <file>pixmaps/previous.png</file>
<file>pixmaps/next.png</file> <file>pixmaps/next.png</file>
......
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