vlc_value_t, vlc_value_t, void * );
static int InterfaceChanged( vlc_object_t *, const char *,
vlc_value_t, vlc_value_t, void * );
+static int StatisticsUpdated( vlc_object_t *, const char *,
+ vlc_value_t, vlc_value_t, void * );
static int InterfaceVoutChanged( vlc_object_t *, const char *,
vlc_value_t, vlc_value_t, void * );
static int ItemStateChanged( vlc_object_t *, const char *,
QObject( parent ), p_intf( _p_intf )
{
i_old_playing_status = END_S;
- old_name = "";
+ oldName = "";
artUrl = "";
p_input = NULL;
i_rate = 0;
i_input_id = 0;
b_video = false;
- b_transparentTelextext = false;
+ timeA = 0;
+ timeB = 0;
+
}
InputManager::~InputManager()
emit statusChanged( PLAYING_S );
UpdateMeta();
UpdateArt();
- UpdateSPU();
UpdateTeletext();
UpdateNavigation();
UpdateVout();
delCallbacks();
i_old_playing_status = END_S;
i_input_id = 0;
- old_name = "";
+ oldName = "";
artUrl = "";
b_video = false;
+ timeA = 0;
+ timeB = 0;
emit positionUpdated( -1.0, 0 ,0 );
emit statusChanged( END_S );
emit nameChanged( "" );
emit voutChanged( false );
vlc_object_release( p_input );
p_input = NULL;
- UpdateSPU();
UpdateTeletext();
}
}
var_AddCallback( p_input, "state", ItemStateChanged, this );
/* src/input/es-out.c:552 */
var_AddCallback( p_input, "spu-es", ChangeSPU, this );
- /* emit UpdateStatus so that main_interface updates controls
+ /* emit UpdateStatus so that main_interface updates controls
* if there is new videotracks (mpeg-ts)*/
var_AddCallback( p_input, "video-es", ItemStateChanged, this );
/* src/input/es-out.c: */
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:710 for statistics update*/
+ var_AddCallback( p_input, "stats-change", StatisticsUpdated, this );
/* src/input/input.c for vout creation/destruction */
var_AddCallback( p_input, "intf-change-vout", InterfaceVoutChanged, this );
}
var_DelCallback( p_input, "rate-change", ItemRateChanged, this );
var_DelCallback( p_input, "title", ItemTitleChanged, this );
var_DelCallback( p_input, "intf-change", InterfaceChanged, this );
+ var_DelCallback( p_input, "stats-change", StatisticsUpdated, this );
var_DelCallback( p_input, "intf-change-vout", InterfaceVoutChanged, this );
}
/* Convert the event from the callbacks in actions */
void InputManager::customEvent( QEvent *event )
{
- int type = event->type();
+ int i_type = event->type();
IMEvent *ple = static_cast<IMEvent *>(event);
- if ( type != PositionUpdate_Type &&
- type != ItemChanged_Type &&
- type != ItemRateChanged_Type &&
- type != ItemTitleChanged_Type &&
- type != ItemSpuChanged_Type &&
- type != ItemTeletextChanged_Type &&
- type != ItemStateChanged_Type &&
- type != InterfaceVoutUpdate_Type )
+ if ( i_type != PositionUpdate_Type &&
+ i_type != ItemChanged_Type &&
+ i_type != ItemRateChanged_Type &&
+ i_type != ItemTitleChanged_Type &&
+ i_type != ItemSpuChanged_Type &&
+ i_type != ItemTeletextChanged_Type &&
+ i_type != ItemStateChanged_Type &&
+ i_type != StatisticsUpdate_Type &&
+ i_type != InterfaceVoutUpdate_Type )
return;
- if( type == ItemStateChanged_Type )
+ if( i_type == ItemStateChanged_Type )
{
UpdateNavigation();
UpdateTeletext();
if( !hasInput() ) return;
- if( ( type != PositionUpdate_Type &&
- type != ItemRateChanged_Type &&
- type != ItemSpuChanged_Type &&
- type != ItemTeletextChanged_Type &&
- type != ItemStateChanged_Type &&
- type != InterfaceVoutUpdate_Type
+ if( ( i_type != PositionUpdate_Type &&
+ i_type != ItemRateChanged_Type &&
+ i_type != ItemSpuChanged_Type &&
+ i_type != ItemTeletextChanged_Type &&
+ i_type != ItemStateChanged_Type &&
+ i_type != StatisticsUpdate_Type &&
+ i_type != InterfaceVoutUpdate_Type
)
&& ( i_input_id != ple->i_id ) )
return;
- if( type != PositionUpdate_Type )
- msg_Dbg( p_intf, "New Event: type %i", type );
+ if( i_type != PositionUpdate_Type &&
+ i_type != StatisticsUpdate_Type )
+ msg_Dbg( p_intf, "New Event: type %i", i_type );
/* Actions */
- switch( type )
+ switch( i_type )
{
case PositionUpdate_Type:
UpdatePosition();
break;
+ case StatisticsUpdate_Type:
+ UpdateStats();
+ break;
case ItemChanged_Type:
UpdateMeta();
UpdateStatus();
case InterfaceVoutUpdate_Type:
UpdateVout();
break;
+ default:
+ msg_Warn( p_intf, "This shouldn't happen: %i", i_type );
}
}
+void InputManager::UpdateStats()
+{
+ emit statisticsUpdated( input_GetItem( p_input ) );
+}
+
void InputManager::UpdatePosition()
{
/* Update position */
{
/* Update navigation status */
vlc_value_t val; val.i_int = 0;
+
if( hasInput() )
var_Change( p_input, "title", VLC_VAR_CHOICESCOUNT, &val, NULL );
+
if( val.i_int > 0 )
{
+ emit titleChanged( true );
+ /* p_input != NULL since val.i_int != 0 */
val.i_int = 0;
var_Change( p_input, "chapter", VLC_VAR_CHOICESCOUNT, &val, NULL );
- emit navigationChanged( (val.i_int > 0) ? 1 : 2 );
+ emit chapterChanged( (val.i_int > 0) );
}
else
- {
- emit navigationChanged( 0 );
- }
+ emit titleChanged( false );
}
void InputManager::UpdateStatus()
free( psz_name );
}
- if( old_name != text )
+ if( oldName != text )
{
emit nameChanged( text );
- old_name=text;
+ oldName=text;
}
}
void InputManager::UpdateTeletext()
{
if( hasInput() )
- telexToggle( var_GetInteger( p_input, "teletext-es" ) >= 0 );
+ telexActivation( var_GetInteger( p_input, "teletext-es" ) >= 0 );
else
- telexToggle( false );
+ telexActivation( false );
}
void InputManager::UpdateVout()
{
bool b_old_video = b_video;
- vlc_object_t *p_vout = (vlc_object_t*)vlc_object_find( p_input, VLC_OBJECT_VOUT, FIND_CHILD );
+ vlc_object_t *p_vout = (vlc_object_t*)vlc_object_find( p_input,
+ VLC_OBJECT_VOUT, FIND_CHILD );
b_video = p_vout != NULL;
if( p_vout )
vlc_object_release( p_vout );
void InputManager::togglePlayPause()
{
vlc_value_t state;
- var_Get( p_input, "state", &state );
- state.i_int = ( state.i_int != PLAYING_S ) ? PLAYING_S : PAUSE_S;
- var_Set( p_input, "state", state );
- emit statusChanged( state.i_int );
+ if( hasInput() )
+ {
+ var_Get( p_input, "state", &state );
+ state.i_int = ( state.i_int != PLAYING_S ) ? PLAYING_S : PAUSE_S;
+ var_Set( p_input, "state", state );
+ emit statusChanged( state.i_int );
+ }
}
void InputManager::sectionPrev()
}
}
-void InputManager::telexGotoPage( int page )
+/*
+ * Teletext Functions
+ */
+
+/* Set a new Teletext Page */
+void InputManager::telexSetPage( int page )
{
if( hasInput() )
{
if( i_teletext_es >= 0 && i_teletext_es == i_spu_es )
{
- vlc_object_t *p_vbi;
- p_vbi = (vlc_object_t *) vlc_object_find_name( p_input,
+ vlc_object_t *p_vbi = (vlc_object_t *) vlc_object_find_name( p_input,
"zvbi", FIND_ANYWHERE );
if( p_vbi )
{
var_SetInteger( p_vbi, "vbi-page", page );
vlc_object_release( p_vbi );
+ emit newTelexPageSet( page );
}
}
}
- emit setNewTelexPage( page );
}
-void InputManager::telexToggle( bool b_enabled )
+/* Set the transparency on teletext */
+void InputManager::telexSetTransparency( bool b_transparentTelextext )
+{
+ if( hasInput() )
+ {
+ vlc_object_t *p_vbi = (vlc_object_t *) vlc_object_find_name( p_input,
+ "zvbi", FIND_ANYWHERE );
+ if( p_vbi )
+ {
+ var_SetBool( p_vbi, "vbi-opaque", b_transparentTelextext );
+ vlc_object_release( p_vbi );
+ emit teletextTransparencyActivated( b_transparentTelextext );
+ }
+ }
+}
+
+void InputManager::telexActivation( bool b_enabled )
{
if( hasInput() )
{
const int i_teletext_es = var_GetInteger( p_input, "teletext-es" );
const int i_spu_es = var_GetInteger( p_input, "spu-es" );
+ /* Teletext is possible. Show the buttons */
b_enabled = (i_teletext_es >= 0);
- emit teletextEnabled( b_enabled );
- if( b_enabled && (i_teletext_es == i_spu_es) )
+ emit teletextPossible( b_enabled );
+ if( !b_enabled ) return;
+
+ /* If Teletext is selected */
+ if( i_teletext_es == i_spu_es )
{
- vlc_object_t *p_vbi;
+ /* Activate the buttons */
+ teletextActivated( true );
+
+ /* Then, find the current page */
int i_page = 100;
- p_vbi = (vlc_object_t *) vlc_object_find_name( p_input,
- "zvbi", FIND_ANYWHERE );
+ vlc_object_t *p_vbi = (vlc_object_t *)
+ vlc_object_find_name( p_input, "zvbi", FIND_ANYWHERE );
if( p_vbi )
{
i_page = var_GetInteger( p_vbi, "vbi-page" );
vlc_object_release( p_vbi );
- i_page = b_enabled ? i_page : 0;
- telexGotoPage( i_page );
+ emit newTelexPageSet( i_page );
}
}
}
- else emit teletextEnabled( b_enabled );
+ else
+ emit teletextPossible( b_enabled );
}
-void InputManager::telexToggleButtons()
+void InputManager::activateTeletext( bool b_enable )
{
if( hasInput() )
{
const int i_teletext_es = var_GetInteger( p_input, "teletext-es" );
if( i_teletext_es >= 0 )
{
- const int i_spu_es = var_GetInteger( p_input, "spu-es" );
-
- if( i_teletext_es == i_spu_es )
- var_SetInteger( p_input, "spu-es", -1 );
- else
- var_SetInteger( p_input, "spu-es", i_teletext_es );
-
- emit toggleTelexButtons();
+ var_SetInteger( p_input, "spu-es", b_enable ? i_teletext_es : -1 );
}
}
}
-void InputManager::telexSetTransparency()
-{
- if( hasInput() )
- {
- vlc_object_t *p_vbi;
- p_vbi = (vlc_object_t *) vlc_object_find_name( p_input,
- "zvbi", FIND_ANYWHERE );
- if( p_vbi )
- {
- var_SetBool( p_vbi, "vbi-opaque", b_transparentTelextext );
- b_transparentTelextext = !b_transparentTelextext;
- vlc_object_release( p_vbi );
- }
- }
- emit toggleTelexTransparency();
-}
-
void InputManager::slower()
{
if( hasInput() )
var_SetInteger( p_input, "rate", new_rate );
}
+void InputManager::setAtoB()
+{
+ if( !timeA )
+ {
+ timeA = var_GetTime( THEMIM->getInput(), "time" );
+ }
+ else if( !timeB )
+ {
+ timeB = var_GetTime( THEMIM->getInput(), "time" );
+ var_SetTime( THEMIM->getInput(), "time" , timeA );
+ }
+ else
+ {
+ timeA = 0;
+ timeB = 0;
+ }
+ emit AtoBchanged( (timeA != 0 ), (timeB != 0 ) );
+}
+
+/* Function called regularly when in an AtoB loop */
+void InputManager::AtoBLoop( int i_time )
+{
+ if( timeB )
+ {
+ if( ( i_time >= (int)( timeB/1000000 ) )
+ || ( i_time < (int)( timeA/1000000 ) ) )
+ var_SetTime( THEMIM->getInput(), "time" , timeA );
+ }
+}
+
/**********************************************************************
* MainInputManager implementation. Wrap an input manager and
* take care of updating the main playlist input.
p_input = NULL;
im = new InputManager( this, p_intf );
-// var_AddCallback( THEPL, "item-change", PLItemChanged, this );
var_AddCallback( THEPL, "item-change", ItemChanged, im );
var_AddCallback( THEPL, "playlist-current", PLItemChanged, this );
var_AddCallback( THEPL, "activity", PLItemChanged, this );
var_DelCallback( THEPL, "activity", PLItemChanged, this );
var_DelCallback( THEPL, "item-change", ItemChanged, im );
-// var_DelCallback( THEPL, "item-change", PLItemChanged, this );
var_DelCallback( THEPL, "playlist-current", PLItemChanged, this );
}
}
/* Should be PLItemChanged Event */
- if( VLC_OBJECT_INTF == p_intf->i_object_type ) /* FIXME: don't use object type */
+ if( !p_intf->p_sys->b_isDialogProvider )
{
vlc_mutex_lock( &p_intf->change_lock );
if( p_input && ( p_input->b_dead || !vlc_object_alive (p_input) ) )
void MainInputManager::togglePlayPause()
{
- if( p_input == NULL )
- {
+ /* No input, play */
+ if( !p_input )
playlist_Play( THEPL );
- return;
- }
- getIM()->togglePlayPause();
-}
-
-bool MainInputManager::teletextState()
-{
- im = getIM();
- if( im->hasInput() )
- {
- const int i_teletext_es = var_GetInteger( getInput(), "teletext-es" );
- const int i_spu_es = var_GetInteger( getInput(), "spu-es" );
-
- return i_teletext_es >= 0 && i_teletext_es == i_spu_es;
- }
- return false;
+ else
+ getIM()->togglePlayPause();
}
/* Static callbacks */
{
/* FIXME remove that static variable */
static int counter = 0;
+
InputManager *im = (InputManager*)param;
counter = ++counter % 4;
- if(!counter)
- return VLC_SUCCESS;
+ if(!counter) return VLC_SUCCESS;
+
IMEvent *event = new IMEvent( PositionUpdate_Type, 0 );
QApplication::postEvent( im, static_cast<QEvent*>(event) );
return VLC_SUCCESS;
}
+static int StatisticsUpdated( 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( StatisticsUpdate_Type, 0 );
+ QApplication::postEvent( im, static_cast<QEvent*>(event) );
+ return VLC_SUCCESS;
+}
+
static int InterfaceVoutChanged( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param )
{
projects / vlc / blobdiff