Skip to content

V
vlc-1.1
Commit e178b0ac authored by Ilkka Ollakka's avatar Ilkka Ollakka
Browse files
Options

change input_manager to event-based instead of polling, this is one 

biggest polls in qt4-interface, still maybe few to go. ref 1365
parent d1057723
Show whitespace changes
Inline Side-by-side
Showing with 289 additions and 109 deletions
modules/gui/qt4/input_manager.cpp
View file @ e178b0ac
...@@ -29,6 +29,16 @@ static int ChangeVideo( vlc_object_t *p_this, const char *var, vlc_value_t o, ...@@ -29,6 +29,16 @@ static int ChangeVideo( vlc_object_t *p_this, const char *var, vlc_value_t o,
vlc_value_t n, void *param ); vlc_value_t n, void *param );
static int ChangeAudio( vlc_object_t *p_this, const char *var, vlc_value_t o, static int ChangeAudio( vlc_object_t *p_this, const char *var, vlc_value_t o,
vlc_value_t n, void *param ); vlc_value_t n, void *param );
static int ItemChanged( vlc_object_t *, const char *,
vlc_value_t, vlc_value_t, void * );
static int InterfaceChanged( vlc_object_t *, const char *,
vlc_value_t, vlc_value_t, void * );
static int ItemStateChanged( vlc_object_t *, const char *,
vlc_value_t, vlc_value_t, void * );
static int ItemRateChanged( vlc_object_t *, const char *,
vlc_value_t, vlc_value_t, void * );
static int ItemTitleChanged( vlc_object_t *, const char *,
vlc_value_t, vlc_value_t, void * );
/********************************************************************** /**********************************************************************
* InputManager implementation * InputManager implementation
...@@ -41,19 +51,21 @@ InputManager::InputManager( QObject *parent, intf_thread_t *_p_intf) : ...@@ -41,19 +51,21 @@ InputManager::InputManager( QObject *parent, intf_thread_t *_p_intf) :
old_name = ""; old_name = "";
p_input = NULL; p_input = NULL;
i_rate = 0; i_rate = 0;
ON_TIMEOUT( update() ); var_AddCallback( THEPL, "playlist-current", ItemChanged, this );
var_AddCallback( THEPL, "intf-change", ItemChanged, this );
} }
InputManager::~InputManager() InputManager::~InputManager()
{ {
delInput(); delInput();
var_DelCallback( THEPL, "playlist-current", ItemChanged, this );
var_DelCallback( THEPL, "intf-change", ItemChanged, this );
} }
void InputManager::setInput( input_thread_t *_p_input ) void InputManager::setInput( input_thread_t *_p_input )
{ {
delInput(); delInput();
p_input = _p_input; p_input = _p_input;
emit positionUpdated( 0.0,0,0 );
b_had_audio = b_had_video = b_has_audio = b_has_video = false; b_had_audio = b_had_video = b_has_audio = b_has_video = false;
if( p_input ) if( p_input )
{ {
...@@ -63,8 +75,8 @@ void InputManager::setInput( input_thread_t *_p_input ) ...@@ -63,8 +75,8 @@ void InputManager::setInput( input_thread_t *_p_input )
b_has_video = val.i_int > 0; b_has_video = val.i_int > 0;
var_Change( p_input, "audio-es", VLC_VAR_CHOICESCOUNT, &val, NULL ); var_Change( p_input, "audio-es", VLC_VAR_CHOICESCOUNT, &val, NULL );
b_has_audio = val.i_int > 0; b_has_audio = val.i_int > 0;
var_AddCallback( p_input, "audio-es", ChangeAudio, this ); emit statusChanged( PLAYING_S );
var_AddCallback( p_input, "video-es", ChangeVideo, this ); addCallbacks();
} }
} }
...@@ -72,51 +84,162 @@ void InputManager::delInput() ...@@ -72,51 +84,162 @@ void InputManager::delInput()
{ {
if( p_input ) if( p_input )
{ {
var_DelCallback( p_input, "audio-es", ChangeAudio, this ); delCallbacks();
var_DelCallback( p_input, "video-es", ChangeVideo, this );
vlc_object_release( p_input ); vlc_object_release( p_input );
p_input = NULL; p_input = NULL;
} }
i_old_playing_status = END_S;
old_name=qfu("");
artUrl = qfu("");
emit positionUpdated( 0.0, 0 ,0 );
emit statusChanged( END_S );
emit nameChanged( "" );
emit artChanged( "" );
} }
//TODO break that void InputManager::delCallbacks( void )
void InputManager::update()
{ {
/// \todo Emit the signals only if it changed var_DelCallback( p_input, "audio-es", ChangeAudio, this );
if( !p_input ) var_DelCallback( p_input, "video-es", ChangeVideo, this );
{ var_DelCallback( THEPL, "state", ItemStateChanged, this );
emit nameChanged( "" ); var_DelCallback( p_input, "rate", ItemRateChanged, this );
var_DelCallback( p_input, "title", ItemTitleChanged, this );
var_DelCallback( p_input, "intf-change", InterfaceChanged, this );
var_DelCallback( THEPL, "item-change", ItemChanged, this );
}
void InputManager::addCallbacks( void )
{
var_AddCallback( p_input, "audio-es", ChangeAudio, this );
var_AddCallback( p_input, "video-es", ChangeVideo, this );
/* src/playlist/control.c */
var_AddCallback( THEPL, "state", ItemStateChanged, this );
/* src/input/input.c:1765 */
var_AddCallback( p_input, "rate", ItemRateChanged, this );
/* src/input/input.c:2003 */
var_AddCallback( p_input, "title", ItemTitleChanged, this );
/* src/input/input.c:734 for timers update*/
var_AddCallback( p_input, "intf-change", InterfaceChanged, this );
/* src/input/input.c:2076*/
var_AddCallback( THEPL, "item-change", ItemChanged, this );
}
static int InterfaceChanged( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param )
{
static int counter = 0;
InputManager *im = (InputManager*)param;
counter = counter++ % 4;
if(!counter)
return VLC_SUCCESS;
IMEvent *event = new IMEvent( PositionUpdate_Type, 0 );
QApplication::postEvent( im, static_cast<QEvent*>(event) );
return VLC_SUCCESS;
}
static int ItemStateChanged( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param )
{
InputManager *im = (InputManager*)param;
IMEvent *event = new IMEvent( ItemStateChanged_Type, 0 );
QApplication::postEvent( im, static_cast<QEvent*>(event) );
return VLC_SUCCESS;
}
static int ItemRateChanged( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param )
{
InputManager *im = (InputManager*)param;
IMEvent *event = new IMEvent( ItemRateChanged_Type, 0 );
QApplication::postEvent( im, static_cast<QEvent*>(event) );
return VLC_SUCCESS;
}
static int ItemTitleChanged( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param )
{
InputManager *im = (InputManager*)param;
IMEvent *event = new IMEvent( ItemTitleChanged_Type, 0 );
QApplication::postEvent( im, static_cast<QEvent*>(event) );
return VLC_SUCCESS;
}
static int InputChanged( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param )
{
MainInputManager *im = (MainInputManager*)param;
IMEvent *event = new IMEvent( ItemChanged_Type, newval.i_int );
QApplication::postEvent( im, static_cast<QEvent*>(event) );
return VLC_SUCCESS;
}
static int ItemChanged( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param )
{
InputManager *im = (InputManager*)param;
IMEvent *event = new IMEvent( ItemChanged_Type, newval.i_int );
QApplication::postEvent( im, static_cast<QEvent*>(event) );
return VLC_SUCCESS;
}
void InputManager::customEvent( QEvent *event )
{
int type = event->type();
if ( type != PositionUpdate_Type && type != ItemChanged_Type &&
type != ItemRateChanged_Type && type != ItemTitleChanged_Type &&
type != ItemStateChanged_Type )
return; return;
}
if( p_input->b_dead || p_input->b_die ) if(!p_input || p_input->b_dead || p_input->b_die )
{ {
emit positionUpdated( 0.0, 0, 0 );
emit navigationChanged( 0 );
i_old_playing_status = 0;
emit statusChanged( END_S ); // see vlc_input.h, input_state_e enum
delInput(); delInput();
emit artChanged( "" );
return; return;
} }
IMEvent *ime = static_cast<IMEvent *>(event);
if ( type == PositionUpdate_Type )
{
UpdatePosition();
}
else if ( type == ItemChanged_Type )
{
UpdateMeta();
}
else if ( type == ItemRateChanged_Type )
{
UpdatePosition();
}
else if ( type == ItemTitleChanged_Type )
{
UpdateTitle();
}
else if (type == ItemStateChanged_Type )
{
UpdateStatus();
}
}
void InputManager::UpdatePosition( void )
{
/* Update position */ /* Update position */
int i_length, i_time; /* Int is enough, since we store seconds */ int i_length, i_time; /* Int is enough, since we store seconds */
float f_pos; float f_pos;
i_length = var_GetTime( p_input, "length" ) / 1000000; i_length = var_GetTime( p_input , "length" ) / 1000000;
i_time = var_GetTime( p_input, "time") / 1000000; i_time = var_GetTime( p_input , "time") / 1000000;
f_pos = var_GetFloat( p_input, "position" ); f_pos = var_GetFloat( p_input , "position" );
emit positionUpdated( f_pos, i_time, i_length ); emit positionUpdated( f_pos, i_time, i_length );
}
/* Update Rate */ void InputManager::UpdateTitle( void )
int i_new_rate = var_GetInteger( p_input, "rate"); {
if( i_new_rate != i_rate )
{
i_rate = i_new_rate;
/* Update rate */
emit rateChanged( i_rate );
}
/* Update navigation status */ /* Update navigation status */
vlc_value_t val; val.i_int = 0; vlc_value_t val; val.i_int = 0;
var_Change( p_input, "title", VLC_VAR_CHOICESCOUNT, &val, NULL ); var_Change( p_input, "title", VLC_VAR_CHOICESCOUNT, &val, NULL );
...@@ -125,25 +248,39 @@ void InputManager::update() ...@@ -125,25 +248,39 @@ void InputManager::update()
val.i_int = 0; val.i_int = 0;
var_Change( p_input, "chapter", VLC_VAR_CHOICESCOUNT, &val, NULL ); var_Change( p_input, "chapter", VLC_VAR_CHOICESCOUNT, &val, NULL );
emit navigationChanged( (val.i_int > 0) ? 1 : 2 ); emit navigationChanged( (val.i_int > 0) ? 1 : 2 );
/*if( val.i_int > 0 )
{
emit navigationChanged( 1 ); // 1 = chapter, 2 = title, 0 = NO
} }
else else
{ {
emit navigationChanged( 2 ); emit navigationChanged( 0 );
}*/
} }
else }
void InputManager::UpdateStatus( void )
{
/* Update playing status */
vlc_value_t val; val.i_int = 0;
var_Get( p_input, "state", &val );
if( i_old_playing_status != val.i_int )
{ {
emit navigationChanged( 0 ); i_old_playing_status = val.i_int;
emit statusChanged( val.i_int );
} }
}
#ifdef ZVBI_COMPILED void InputManager::UpdateRate( void )
/* Update teletext status*/ {
emit teletextEnabled( true );/* FIXME */ /* Update Rate */
#endif int i_new_rate = var_GetInteger( p_input, "rate");
if( i_new_rate != i_rate )
{
i_rate = i_new_rate;
/* Update rate */
emit rateChanged( i_rate );
}
}
void InputManager::UpdateMeta( void )
{
/* Update text */ /* Update text */
QString text; QString text;
char *psz_name = input_item_GetTitle( input_GetItem( p_input ) ); char *psz_name = input_item_GetTitle( input_GetItem( p_input ) );
...@@ -176,15 +313,6 @@ void InputManager::update() ...@@ -176,15 +313,6 @@ void InputManager::update()
old_name=text; old_name=text;
} }
/* Update playing status */
var_Get( p_input, "state", &val );
val.i_int = val.i_int == PAUSE_S ? PAUSE_S : PLAYING_S;
if( i_old_playing_status != val.i_int )
{
i_old_playing_status = val.i_int;
emit statusChanged( val.i_int == PAUSE_S ? PAUSE_S : PLAYING_S );
}
QString url; QString url;
char *psz_art = input_item_GetArtURL( input_GetItem( p_input ) ); char *psz_art = input_item_GetArtURL( input_GetItem( p_input ) );
url.sprintf("%s", psz_art ); url.sprintf("%s", psz_art );
...@@ -194,6 +322,16 @@ void InputManager::update() ...@@ -194,6 +322,16 @@ void InputManager::update()
artUrl = url.replace( "file://",QString("" ) ); artUrl = url.replace( "file://",QString("" ) );
emit artChanged( artUrl ); emit artChanged( artUrl );
} }
#ifdef ZVBI_COMPILED
/* Update teletext status*/
emit teletextEnabled( true );/* FIXME */
#endif
}
void InputManager::update()
{
} }
void InputManager::sliderUpdate( float new_pos ) void InputManager::sliderUpdate( float new_pos )
...@@ -205,7 +343,8 @@ void InputManager::togglePlayPause() ...@@ -205,7 +343,8 @@ void InputManager::togglePlayPause()
{ {
vlc_value_t state; vlc_value_t state;
var_Get( p_input, "state", &state ); var_Get( p_input, "state", &state );
state.i_int = ( ( state.i_int != PAUSE_S ) ? PAUSE_S : PLAYING_S ); state.i_int = ( ( state.i_int != PLAYING_S ) ? PLAYING_S : PAUSE_S );
msg_Dbg( p_input, "state : %d", state.i_int );
/*{ /*{
/* A stream is being played, pause it */ /* A stream is being played, pause it */
/* state.i_int = PAUSE_S; /* state.i_int = PAUSE_S;
...@@ -323,7 +462,8 @@ MainInputManager::MainInputManager( intf_thread_t *_p_intf ) : QObject(NULL), ...@@ -323,7 +462,8 @@ MainInputManager::MainInputManager( intf_thread_t *_p_intf ) : QObject(NULL),
{ {
p_input = NULL; p_input = NULL;
im = new InputManager( this, p_intf ); im = new InputManager( this, p_intf );
ON_TIMEOUT( updateInput() ); var_AddCallback( THEPL, "playlist-current", InputChanged, this );
var_AddCallback( THEPL, "activity", InputChanged, this );
/* Warn our embedded IM about input changes */ /* Warn our embedded IM about input changes */
CONNECT( this, inputChanged( input_thread_t * ), CONNECT( this, inputChanged( input_thread_t * ),
im, setInput( input_thread_t * ) ); im, setInput( input_thread_t * ) );
...@@ -331,18 +471,28 @@ MainInputManager::MainInputManager( intf_thread_t *_p_intf ) : QObject(NULL), ...@@ -331,18 +471,28 @@ MainInputManager::MainInputManager( intf_thread_t *_p_intf ) : QObject(NULL),
MainInputManager::~MainInputManager() MainInputManager::~MainInputManager()
{ {
if( p_input ) vlc_object_release( p_input ); if( p_input )
{
vlc_object_release( p_input );
emit inputChanged( NULL );
}
var_DelCallback( THEPL, "playlist-current", InputChanged, this );
var_DelCallback( THEPL, "activity", InputChanged, this );
} }
void MainInputManager::updateInput() void MainInputManager::customEvent( QEvent *event )
{ {
int type = event->type();
if ( type != ItemChanged_Type )
return;
if( VLC_OBJECT_INTF == p_intf->i_object_type ) if( VLC_OBJECT_INTF == p_intf->i_object_type )
{ {
vlc_mutex_lock( &p_intf->change_lock ); vlc_mutex_lock( &p_intf->change_lock );
if( p_input && p_input->b_dead ) if( p_input && ( p_input->b_dead || p_input->b_die ) )
{ {
var_DelCallback( p_input, "state", InputChanged, this );
vlc_object_release( p_input ); vlc_object_release( p_input );
getIM()->delInput();
p_input = NULL; p_input = NULL;
emit inputChanged( NULL ); emit inputChanged( NULL );
} }
...@@ -351,11 +501,14 @@ void MainInputManager::updateInput() ...@@ -351,11 +501,14 @@ void MainInputManager::updateInput()
{ {
QPL_LOCK; QPL_LOCK;
p_input = THEPL->p_input; p_input = THEPL->p_input;
if( p_input ) if( p_input && !( p_input->b_die || p_input->b_dead) )
{ {
vlc_object_yield( p_input ); vlc_object_yield( p_input );
var_AddCallback( p_input, "state", InputChanged, this );
emit inputChanged( p_input ); emit inputChanged( p_input );
} }
else
p_input = NULL;
QPL_UNLOCK; QPL_UNLOCK;
} }
vlc_mutex_unlock( &p_intf->change_lock ); vlc_mutex_unlock( &p_intf->change_lock );
...@@ -367,6 +520,7 @@ void MainInputManager::updateInput() ...@@ -367,6 +520,7 @@ void MainInputManager::updateInput()
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 );
} }
} }
......
modules/gui/qt4/input_manager.hpp
View file @ e178b0ac
...@@ -28,6 +28,23 @@ ...@@ -28,6 +28,23 @@
#include <vlc_input.h> #include <vlc_input.h>
#include <QObject> #include <QObject>
#include <QEvent>
static int PositionUpdate_Type = QEvent::User + 6;
static int ItemChanged_Type = QEvent::User + 7;
static int ItemRateChanged_Type = QEvent::User + 8;
static int ItemTitleChanged_Type = QEvent::User + 9;
static int ItemStateChanged_Type = QEvent::User + 10;
class IMEvent : public QEvent
{
public:
IMEvent( int type, int id ) : QEvent( (QEvent::Type)(type) )
{ i_id = id ; } ;
virtual ~IMEvent() {};
int i_id;
};
class InputManager : public QObject class InputManager : public QObject
{ {
...@@ -42,6 +59,14 @@ public: ...@@ -42,6 +59,14 @@ public:
bool hasVideo() { return b_has_video; } bool hasVideo() { return b_has_video; }
bool b_has_audio, b_has_video, b_had_audio, b_had_video; bool b_has_audio, b_has_video, b_had_audio, b_had_video;
private: private:
void customEvent( QEvent * );
void addCallbacks( void );
void delCallbacks( void );
void UpdateRate( void );
void UpdateMeta( void );
void UpdateStatus( void );
void UpdateTitle( void );
void UpdatePosition( void );
intf_thread_t *p_intf; intf_thread_t *p_intf;
input_thread_t *p_input; input_thread_t *p_input;
int i_old_playing_status; int i_old_playing_status;
...@@ -99,6 +124,7 @@ public: ...@@ -99,6 +124,7 @@ public:
InputManager *getIM() { return im; }; InputManager *getIM() { return im; };
private: private:
void customEvent( QEvent * );
MainInputManager( intf_thread_t * ); MainInputManager( intf_thread_t * );
InputManager *im; InputManager *im;
...@@ -111,7 +137,7 @@ public slots: ...@@ -111,7 +137,7 @@ public slots:
void next(); void next();
void prev(); void prev();
private slots: private slots:
void updateInput(); //void updateInput();
signals: signals:
void inputChanged( input_thread_t * ); void inputChanged( input_thread_t * );
}; };
......
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