#endif
#include "input_manager.hpp"
+#include <vlc_keys.h>
+#include <vlc_url.h>
#include <QApplication>
+#include <assert.h>
+
static int ItemChanged( vlc_object_t *, const char *,
vlc_value_t, vlc_value_t, void * );
static int PLItemChanged( vlc_object_t *, const char *,
static int InputEvent( vlc_object_t *, const char *,
vlc_value_t, vlc_value_t, void * );
+static int VbiEvent( vlc_object_t *, const char *,
+ vlc_value_t, vlc_value_t, void * );
/**********************************************************************
artUrl = "";
p_input = NULL;
i_rate = 0;
- i_input_id = 0;
+ p_item = NULL;
b_video = false;
timeA = 0;
timeB = 0;
-
+ f_cache = -1.; /* impossible initial value, different from all */
}
InputManager::~InputManager()
p_input = _p_input;
if( p_input && !( p_input->b_dead || !vlc_object_alive (p_input) ) )
{
+ msg_Dbg( p_intf, "IM: Setting an input" );
vlc_object_hold( p_input );
emit statusChanged( PLAYING_S );
UpdateName();
UpdateNavigation();
UpdateVout();
addCallbacks();
- i_input_id = input_GetItem( p_input )->i_id;
+ p_item = input_GetItem( p_input );
}
else
{
p_input = NULL;
- i_input_id = 0;
+ p_item = NULL;
emit rateChanged( INPUT_RATE_DEFAULT );
}
}
void InputManager::delInput()
{
if( !p_input ) return;
+ msg_Dbg( p_intf, "IM: Deleting the input" );
delCallbacks();
i_old_playing_status = END_S;
- i_input_id = 0;
+ p_item = NULL;
oldName = "";
artUrl = "";
b_video = false;
timeA = 0;
timeB = 0;
+ vlc_object_release( p_input );
+ p_input = NULL;
+
emit positionUpdated( -1.0, 0 ,0 );
emit rateChanged( INPUT_RATE_DEFAULT ); /* TODO: Do we want this ? */
emit nameChanged( "" );
emit titleChanged( 0 );
emit statusChanged( END_S );
- /* Reset InfoPanels but stats */
- emit artChanged( NULL );
- emit infoChanged( NULL );
- emit metaChanged( NULL );
-
emit teletextPossible( false );
+ emit AtoBchanged( false, false );
emit voutChanged( false );
+ emit voutListChanged( NULL, 0 );
-// FIXME emit AtoBchanged( );
- vlc_object_release( p_input ); /* FIXME: Can't we release sooner ? */
-
- p_input = NULL;
-}
+ /* Reset all InfoPanels but stats */
+ emit artChanged( NULL );
+ emit infoChanged( NULL );
+ emit currentMetaChanged( (input_item_t *)NULL );
-/* Add the callbacks on Input. Self explanatory */
-inline void InputManager::addCallbacks()
-{
- var_AddCallback( p_input, "intf-event", InputEvent, this );
-}
-
-/* Delete the callbacks on Input. Self explanatory */
-inline void InputManager::delCallbacks()
-{
- var_DelCallback( p_input, "intf-event", InputEvent, this );
+ emit encryptionChanged( false );
+ emit recordingStateChanged( false );
}
/* Convert the event from the callbacks in actions */
int i_type = event->type();
IMEvent *ple = static_cast<IMEvent *>(event);
- if ( i_type != PositionUpdate_Type &&
- i_type != ItemChanged_Type &&
- i_type != ItemRateChanged_Type &&
- i_type != ItemTitleChanged_Type &&
- i_type != ItemEsChanged_Type &&
- i_type != ItemTeletextChanged_Type &&
- i_type != ItemStateChanged_Type &&
- i_type != StatisticsUpdate_Type &&
- i_type != InterfaceVoutUpdate_Type &&
- i_type != MetaChanged_Type &&
- i_type != NameChanged_Type &&
- i_type != InfoChanged_Type )
- return;
+ if( i_type == ItemChanged_Type )
+ UpdateMeta( ple->p_item );
- if( !hasInput() ) return;
-
- if( ( i_type != PositionUpdate_Type &&
- i_type != ItemRateChanged_Type &&
- i_type != ItemEsChanged_Type &&
- i_type != ItemTeletextChanged_Type &&
- i_type != ItemStateChanged_Type &&
- i_type != StatisticsUpdate_Type &&
- i_type != InterfaceVoutUpdate_Type &&
- i_type != MetaChanged_Type &&
- i_type != NameChanged_Type &&
- i_type != InfoChanged_Type
- )
- && ( i_input_id != ple->i_id ) )
+ if( !hasInput() )
return;
- if( i_type != PositionUpdate_Type &&
- i_type != StatisticsUpdate_Type )
- msg_Dbg( p_intf, "New Event: type %i", i_type );
-
/* Actions */
switch( i_type )
{
UpdateStats();
break;
case ItemChanged_Type:
- UpdateStatus();
- // UpdateName();
- // UpdateArt();
+ /* Ignore ItemChanged_Type event that does not apply to our input */
+ if( p_item == ple->p_item )
+ {
+ UpdateStatus();
+ // UpdateName();
+ UpdateArt();
+ /* Update duration of file */
+ }
break;
case ItemStateChanged_Type:
// TODO: Fusion with above state
UpdateRate();
break;
case ItemEsChanged_Type:
- // We don't do anything. Why ?
+ UpdateTeletext();
+ // We don't do anything ES related. Why ?
break;
case ItemTeletextChanged_Type:
UpdateTeletext();
case InterfaceVoutUpdate_Type:
UpdateVout();
break;
+ case SynchroChanged_Type:
+ emit synchroChanged();
+ break;
+ case CachingEvent_Type:
+ UpdateCaching();
+ break;
+ case BookmarksChanged_Type:
+ emit bookmarksChanged();
+ break;
+ case InterfaceAoutUpdate_Type:
+ UpdateAout();
+ break;
+ case RecordingEvent_Type:
+ UpdateRecord();
+ break;
+ case ProgramChanged_Type:
+ UpdateProgramEvent();
+ break;
default:
msg_Warn( p_intf, "This shouldn't happen: %i", i_type );
+ assert(0);
+ }
+}
+
+/* Add the callbacks on Input. Self explanatory */
+inline void InputManager::addCallbacks()
+{
+ var_AddCallback( p_input, "intf-event", InputEvent, this );
+}
+
+/* Delete the callbacks on Input. Self explanatory */
+inline void InputManager::delCallbacks()
+{
+ var_DelCallback( p_input, "intf-event", InputEvent, this );
+}
+
+/* Static callbacks for IM */
+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;
+ input_item_t *p_item = static_cast<input_item_t *>(newval.p_address);
+
+ IMEvent *event = new IMEvent( ItemChanged_Type, p_item );
+ QApplication::postEvent( im, event );
+ return VLC_SUCCESS;
+}
+
+static int InputEvent( vlc_object_t *p_this, const char *,
+ vlc_value_t, vlc_value_t newval, void *param )
+{
+ InputManager *im = (InputManager*)param;
+ IMEvent *event;
+
+ switch( newval.i_int )
+ {
+ case INPUT_EVENT_STATE:
+ event = new IMEvent( ItemStateChanged_Type );
+ break;
+ case INPUT_EVENT_RATE:
+ event = new IMEvent( ItemRateChanged_Type );
+ break;
+ case INPUT_EVENT_POSITION:
+ //case INPUT_EVENT_LENGTH:
+ event = new IMEvent( PositionUpdate_Type );
+ break;
+
+ case INPUT_EVENT_TITLE:
+ case INPUT_EVENT_CHAPTER:
+ event = new IMEvent( ItemTitleChanged_Type );
+ break;
+
+ case INPUT_EVENT_ES:
+ event = new IMEvent( ItemEsChanged_Type );
+ break;
+ case INPUT_EVENT_TELETEXT:
+ event = new IMEvent( ItemTeletextChanged_Type );
+ break;
+
+ case INPUT_EVENT_STATISTICS:
+ event = new IMEvent( StatisticsUpdate_Type );
+ break;
+
+ case INPUT_EVENT_VOUT:
+ event = new IMEvent( InterfaceVoutUpdate_Type );
+ break;
+ case INPUT_EVENT_AOUT:
+ event = new IMEvent( InterfaceAoutUpdate_Type );
+ break;
+
+ case INPUT_EVENT_ITEM_META: /* Codec MetaData + Art */
+ event = new IMEvent( MetaChanged_Type );
+ break;
+ case INPUT_EVENT_ITEM_INFO: /* Codec Info */
+ event = new IMEvent( InfoChanged_Type );
+ break;
+ case INPUT_EVENT_ITEM_NAME:
+ event = new IMEvent( NameChanged_Type );
+ break;
+
+ case INPUT_EVENT_AUDIO_DELAY:
+ case INPUT_EVENT_SUBTITLE_DELAY:
+ event = new IMEvent( SynchroChanged_Type );
+ break;
+
+ case INPUT_EVENT_CACHE:
+ event = new IMEvent( CachingEvent_Type );
+ break;
+
+ case INPUT_EVENT_BOOKMARK:
+ event = new IMEvent( BookmarksChanged_Type );
+ break;
+
+ case INPUT_EVENT_RECORD:
+ event = new IMEvent( RecordingEvent_Type );
+ break;
+
+ case INPUT_EVENT_PROGRAM:
+ /* This is for PID changes */
+ event = new IMEvent( ProgramChanged_Type );
+ break;
+
+ case INPUT_EVENT_SIGNAL:
+ /* This is for capture-card signals */
+ /* event = new IMEvent( SignalChanged_Type );
+ break; */
+ default:
+ event = NULL;
+ break;
}
+
+ if( event )
+ QApplication::postEvent( im, event );
+ return VLC_SUCCESS;
+}
+
+static int VbiEvent( vlc_object_t *, const char *,
+ vlc_value_t, vlc_value_t, void *param )
+{
+ InputManager *im = (InputManager*)param;
+ IMEvent *event = new IMEvent( ItemTeletextChanged_Type );
+
+ QApplication::postEvent( im, event );
+ return VLC_SUCCESS;
}
void InputManager::UpdatePosition()
if( val.i_int > 0 )
{
emit titleChanged( true );
+ msg_Dbg( p_intf, "Title %i", val.i_int );
/* p_input != NULL since val.i_int != 0 */
val.i_int = 0;
var_Change( p_input, "chapter", VLC_VAR_CHOICESCOUNT, &val, NULL );
emit chapterChanged( (val.i_int > 0) );
+ msg_Dbg( p_intf, "Chapter: %i", val.i_int );
}
else
emit titleChanged( false );
void InputManager::UpdateStatus()
{
/* 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 )
+ int state = var_GetInteger( p_input, "state" );
+ if( i_old_playing_status != state )
{
- i_old_playing_status = val.i_int;
- emit statusChanged( val.i_int );
+ i_old_playing_status = state;
+ emit statusChanged( state );
}
}
QString text;
/* Try to get the Title, then the Name */
- char *psz_name = input_item_GetTitle( input_GetItem( p_input ) );
- if( EMPTY_STR( psz_name ) )
- {
- free( psz_name );
- psz_name = input_item_GetName( input_GetItem( p_input ) );
- }
+ char *psz_name = input_item_GetTitleFbName( input_GetItem( p_input ) );
/* Try to get the nowplaying */
char *psz_nowplaying =
void InputManager::UpdateTeletext()
{
if( hasInput() )
- telexActivation( var_GetInteger( p_input, "teletext-es" ) >= 0 );
+ {
+ const bool b_enabled = var_CountChoices( p_input, "teletext-es" ) > 0;
+ const int i_teletext_es = var_GetInteger( p_input, "teletext-es" );
+
+ /* Teletext is possible. Show the buttons */
+ emit teletextPossible( b_enabled );
+
+ /* If Teletext is selected */
+ if( b_enabled && i_teletext_es >= 0 )
+ {
+ /* Then, find the current page */
+ int i_page = 100;
+ bool b_transparent = false;
+
+ vlc_object_t *p_vbi = (vlc_object_t *)
+ vlc_object_find_name( p_input, "zvbi", FIND_CHILD );
+
+ if( p_vbi )
+ {
+ /* We deleted it (if not here, it does not harm), because
+ * var_AddCallback will silently add a duplicated one */
+ var_DelCallback( p_vbi, "vbi-page", VbiEvent, this );
+ /* This callback is not remove explicitly, but interfaces
+ * are guaranted to outlive input */
+ var_AddCallback( p_vbi, "vbi-page", VbiEvent, this );
+
+ i_page = var_GetInteger( p_vbi, "vbi-page" );
+ b_transparent = !var_GetBool( p_vbi, "vbi-opaque" );
+ vlc_object_release( p_vbi );
+ }
+ emit newTelexPageSet( i_page );
+ emit teletextTransparencyActivated( b_transparent );
+
+ }
+ emit teletextActivated( b_enabled && i_teletext_es >= 0 );
+ }
else
- telexActivation( false );
+ {
+ emit teletextActivated( false );
+ emit teletextPossible( false );
+ }
}
void InputManager::UpdateVout()
{
if( hasInput() )
{
- bool b_old_video = b_video;
+ /* Get current vout lists from input */
+ int i_vout;
+ vout_thread_t **pp_vout;
+ if( input_Control( p_input, INPUT_GET_VOUTS, &pp_vout, &i_vout ) )
+ {
+ i_vout = 0;
+ pp_vout = NULL;
+ }
+
+ /* */
+ emit voutListChanged( pp_vout, i_vout );
- 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 );
+ /* */
+ bool b_old_video = b_video;
+ b_video = i_vout > 0;
if( !!b_old_video != !!b_video )
emit voutChanged( b_video );
+
+ /* Release the vout list */
+ for( int i = 0; i < i_vout; i++ )
+ vlc_object_release( (vlc_object_t*)pp_vout[i] );
+ free( pp_vout );
+ }
+}
+void InputManager::UpdateAout()
+{
+ if( hasInput() )
+ {
+ /* TODO */
+ }
+}
+void InputManager::UpdateCaching()
+{
+ if(!hasInput()) return;
+
+ float f_newCache = var_GetFloat ( p_input, "cache" );
+ if( f_newCache != f_cache )
+ {
+ f_cache = f_newCache;
+ /* Update rate */
+ emit cachingChanged( f_cache );
}
}
-inline void InputManager::UpdateArt()
+void InputManager::requestArtUpdate()
{
+ if( hasInput() )
+ {
+ playlist_t *p_playlist = pl_Hold( p_intf );
+ playlist_AskForArtEnqueue( p_playlist, input_GetItem( p_input ), pl_Unlocked );
+ pl_Release( p_intf );
+ }
+ else
+ {
+ /* No input will signal the cover art to update,
+ * let's do it ourself */
+ UpdateArt();
+ }
+}
+
+void InputManager::UpdateArt()
+{
+ QString url;
+
+ if( hasInput() )
+ {
+ char *psz_art = input_item_GetArtURL( input_GetItem( p_input ) );
+ if( psz_art && !strncmp( psz_art, "file://", 7 ) &&
+ decode_URI( psz_art + 7 ) )
+#ifdef WIN32
+ url = qfu( psz_art + 8 ); // Remove extra / starting on Win32.
+#else
+ url = qfu( psz_art + 7 );
+#endif
+ free( psz_art );
+
+ url = url.replace( "file://", "" );
+ /* Taglib seems to define a attachment://, It won't work yet */
+ url = url.replace( "attachment://", "" );
+ }
+
/* Update Art meta */
- emit artChanged( input_GetItem( p_input ) );
+ emit artChanged( url );
}
inline void InputManager::UpdateStats()
emit statisticsUpdated( input_GetItem( p_input ) );
}
+inline void InputManager::UpdateMeta( input_item_t *p_item )
+{
+ emit metaChanged( p_item );
+}
+
inline void InputManager::UpdateMeta()
{
- emit metaChanged( input_GetItem( p_input ) );
+ emit currentMetaChanged( input_GetItem( p_input ) );
}
inline void InputManager::UpdateInfo()
emit infoChanged( input_GetItem( p_input ) );
}
+void InputManager::UpdateRecord()
+{
+ if( hasInput() )
+ {
+ emit recordingStateChanged( var_GetBool( p_input, "record" ) );
+ }
+}
+
+void InputManager::UpdateProgramEvent()
+{
+ if( hasInput() )
+ {
+ bool b_scrambled = var_GetBool( p_input, "program-scrambled" );
+ emit encryptionChanged( b_scrambled );
+ }
+}
+
/* User update of the slider */
void InputManager::sliderUpdate( float new_pos )
{
/* User togglePlayPause */
void InputManager::togglePlayPause()
{
- vlc_value_t state;
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 );
+ int state = var_GetInteger( p_input, "state" );
+ state = ( state != PLAYING_S ) ? PLAYING_S : PAUSE_S;
+ var_SetInteger( p_input, "state", state );
+ emit statusChanged( state );
}
}
if( hasInput() )
{
int i_type = var_Type( p_input, "next-chapter" );
- vlc_value_t val; val.b_bool = true;
- var_Set( p_input, (i_type & VLC_VAR_TYPE) != 0 ?
- "prev-chapter":"prev-title", val );
+ var_TriggerCallback( p_input, (i_type & VLC_VAR_TYPE) != 0 ?
+ "prev-chapter":"prev-title" );
}
}
if( hasInput() )
{
int i_type = var_Type( p_input, "next-chapter" );
- vlc_value_t val; val.b_bool = true;
- var_Set( p_input, (i_type & VLC_VAR_TYPE) != 0 ?
- "next-chapter":"next-title", val );
+ var_TriggerCallback( p_input, (i_type & VLC_VAR_TYPE) != 0 ?
+ "next-chapter":"next-title" );
}
}
if( hasInput() )
{
vlc_value_t val, text;
- vlc_value_t root;
if( var_Change( p_input, "title 0", VLC_VAR_GETLIST, &val, &text ) < 0 )
return;
/* XXX is it "Root" or "Title" we want here ?" (set 0 by default) */
- root.i_int = 0;
+ int root = 0;
for( int i = 0; i < val.p_list->i_count; i++ )
{
if( !strcmp( text.p_list->p_values[i].psz_string, "Title" ) )
- root.i_int = i;
+ root = i;
}
- var_Change( p_input, "title 0", VLC_VAR_FREELIST, &val, &text );
+ var_FreeList( &val, &text );
- var_Set( p_input, "title 0", root );
+ var_SetInteger( p_input, "title 0", root );
}
}
if( hasInput() )
{
const int i_teletext_es = var_GetInteger( p_input, "teletext-es" );
- const int i_spu_es = var_GetInteger( p_input, "spu-es" );
- if( i_teletext_es >= 0 && i_teletext_es == i_spu_es )
+ if( i_teletext_es >= 0 )
{
vlc_object_t *p_vbi = (vlc_object_t *) vlc_object_find_name( p_input,
- "zvbi", FIND_ANYWHERE );
+ "zvbi", FIND_CHILD );
if( p_vbi )
{
var_SetInteger( p_vbi, "vbi-page", page );
if( hasInput() )
{
vlc_object_t *p_vbi = (vlc_object_t *) vlc_object_find_name( p_input,
- "zvbi", FIND_ANYWHERE );
+ "zvbi", FIND_CHILD );
if( p_vbi )
{
- var_SetBool( p_vbi, "vbi-opaque", b_transparentTelextext );
+ var_SetBool( p_vbi, "vbi-opaque", !b_transparentTelextext );
vlc_object_release( p_vbi );
emit teletextTransparencyActivated( b_transparentTelextext );
}
}
}
-void InputManager::telexActivation( bool b_enabled )
+void InputManager::activateTeletext( bool b_enable )
{
- if( hasInput() )
+ vlc_value_t list;
+ vlc_value_t text;
+ if( hasInput() && !var_Change( p_input, "teletext-es", VLC_VAR_GETLIST, &list, &text ) )
{
- 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 teletextPossible( b_enabled );
- if( !b_enabled ) return;
-
- /* If Teletext is selected */
- if( i_teletext_es == i_spu_es )
+ if( list.p_list->i_count > 0 )
{
- /* Activate the buttons */
- teletextActivated( true );
-
- /* Then, find the current page */
- int i_page = 100;
- vlc_object_t *p_vbi = (vlc_object_t *)
- vlc_object_find_name( p_input, "zvbi", FIND_ANYWHERE );
- if( p_vbi )
+ /* Prefer the page 100 if it is present */
+ int i;
+ for( i = 0; i < text.p_list->i_count; i++ )
{
- i_page = var_GetInteger( p_vbi, "vbi-page" );
- vlc_object_release( p_vbi );
- emit newTelexPageSet( i_page );
+ /* The description is the page number as a string */
+ const char *psz_page = text.p_list->p_values[i].psz_string;
+ if( psz_page && !strcmp( psz_page, "100" ) )
+ break;
}
+ if( i >= list.p_list->i_count )
+ i = 0;
+ var_SetInteger( p_input, "spu-es", b_enable ? list.p_list->p_values[i].i_int : -1 );
}
- }
- else
- emit teletextPossible( b_enabled );
-}
-
-void InputManager::activateTeletext( bool b_enable )
-{
- if( hasInput() )
- {
- const int i_teletext_es = var_GetInteger( p_input, "teletext-es" );
- if( i_teletext_es >= 0 )
- {
- var_SetInteger( p_input, "spu-es", b_enable ? i_teletext_es : -1 );
- }
+ var_FreeList( &list, &text );
}
}
void InputManager::slower()
{
if( hasInput() )
- var_SetVoid( p_input, "rate-slower" );
+ var_TriggerCallback( p_input, "rate-slower" );
}
void InputManager::faster()
{
if( hasInput() )
- var_SetVoid( p_input, "rate-faster" );
+ var_TriggerCallback( p_input, "rate-faster" );
+}
+
+void InputManager::littlefaster()
+{
+ var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_RATE_FASTER_FINE );
+}
+
+void InputManager::littleslower()
+{
+ var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_RATE_SLOWER_FINE );
}
void InputManager::normalRate()
var_SetInteger( p_input, "rate", new_rate );
}
+void InputManager::jumpFwd()
+{
+ int i_interval = config_GetInt( p_input, "short-jump-size" );
+ if( i_interval > 0 )
+ {
+ mtime_t val = (mtime_t)(i_interval) * 1000000L;
+ var_SetTime( p_input, "time-offset", val );
+ }
+}
+
+void InputManager::jumpBwd()
+{
+ int i_interval = config_GetInt( p_input, "short-jump-size" );
+ if( i_interval > 0 )
+ {
+ mtime_t val = -1 *(mtime_t)(i_interval) * 1000000L;
+ var_SetTime( p_input, "time-offset", val );
+ }
+}
+
void InputManager::setAtoB()
{
if( !timeA )
{
timeB = var_GetTime( THEMIM->getInput(), "time" );
var_SetTime( THEMIM->getInput(), "time" , timeA );
+ CONNECT( this, positionUpdated( float, int, int ),
+ this, AtoBLoop( float, int, int ) );
}
else
{
timeA = 0;
timeB = 0;
+ disconnect( this, SIGNAL( positionUpdated( float, int, int ) ),
+ this, SLOT( AtoBLoop( float, int, int ) ) );
}
emit AtoBchanged( (timeA != 0 ), (timeB != 0 ) );
}
/* Function called regularly when in an AtoB loop */
-void InputManager::AtoBLoop( int i_time )
+void InputManager::AtoBLoop( float, int i_time, int )
{
if( timeB )
{
im = new InputManager( this, p_intf );
var_AddCallback( THEPL, "item-change", ItemChanged, im );
- var_AddCallback( THEPL, "playlist-current", PLItemChanged, this );
+ var_AddCallback( THEPL, "item-current", PLItemChanged, this );
var_AddCallback( THEPL, "activity", PLItemChanged, this );
var_AddCallback( p_intf->p_libvlc, "volume-change", VolumeChanged, this );
CONNECT( this, inputChanged( input_thread_t * ),
im, setInput( input_thread_t * ) );
- /* emit check if playlist has allready started playing */
- vlc_value_t val;
- var_Change( THEPL, "playlist-current", VLC_VAR_CHOICESCOUNT, &val, NULL );
- IMEvent *event = new IMEvent( ItemChanged_Type, val.i_int);
- QApplication::postEvent( this, static_cast<QEvent*>(event) );
+ /* emit check if playlist has already started playing */
+ input_thread_t *p_input = playlist_CurrentInput( THEPL );
+ if( p_input )
+ {
+ input_item_t *p_item = input_GetItem( p_input );
+ if( p_item )
+ {
+ IMEvent *event = new IMEvent( ItemChanged_Type, p_item );
+ customEvent( event );
+ delete event;
+ }
+ vlc_object_release( p_input );
+ }
}
MainInputManager::~MainInputManager()
{
if( p_input )
{
+ emit inputChanged( NULL );
var_DelCallback( p_input, "state", PLItemChanged, this );
vlc_object_release( p_input );
- emit inputChanged( NULL );
}
var_DelCallback( p_intf->p_libvlc, "volume-change", VolumeChanged, this );
var_DelCallback( THEPL, "activity", PLItemChanged, this );
var_DelCallback( THEPL, "item-change", ItemChanged, im );
- var_DelCallback( THEPL, "playlist-current", PLItemChanged, this );
+ var_DelCallback( THEPL, "item-current", PLItemChanged, this );
+}
+
+vout_thread_t* MainInputManager::getVout()
+{
+ return p_input ? input_GetVout( p_input ) : NULL;
+}
+
+aout_instance_t * MainInputManager::getAout()
+{
+ return p_input ? input_GetAout( p_input ) : NULL;
}
void MainInputManager::customEvent( QEvent *event )
/* Should be PLItemChanged Event */
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) ) )
{
+ emit inputChanged( p_input );
var_DelCallback( p_input, "state", PLItemChanged, this );
vlc_object_release( p_input );
- emit inputChanged( NULL );
p_input = NULL;
- vlc_mutex_unlock( &p_intf->change_lock );
return;
}
emit inputChanged( p_input );
}
}
- vlc_mutex_unlock( &p_intf->change_lock );
}
else
{
+ /* remove previous stored p_input */
+ if( p_input )
+ {
+ vlc_object_release( p_input );
+ p_input = NULL;
+ }
/* we are working as a dialogs provider */
playlist_t *p_playlist = pl_Hold( p_intf );
p_input = playlist_CurrentInput( p_playlist );
if( p_input )
{
emit inputChanged( p_input );
- vlc_object_release( p_input );
}
pl_Release( p_intf );
}
getIM()->togglePlayPause();
}
-/* Static callbacks */
-
-/* IM */
-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;
-}
-
-static int InputEvent( vlc_object_t *p_this, const char *,
- vlc_value_t, vlc_value_t newval, void *param )
+void MainInputManager::activatePlayQuit( bool b_exit )
{
- InputManager *im = (InputManager*)param;
- IMEvent *event;
-
- switch( newval.i_int )
- {
- case INPUT_EVENT_STATE:
- event = new IMEvent( ItemStateChanged_Type, 0 );
- break;
- case INPUT_EVENT_RATE:
- event = new IMEvent( ItemRateChanged_Type, 0 );
- break;
- case INPUT_EVENT_TIMES:
- event = new IMEvent( PositionUpdate_Type, 0 );
- break;
-
- case INPUT_EVENT_TITLE:
- case INPUT_EVENT_CHAPTER:
- event = new IMEvent( ItemTitleChanged_Type, 0 );
- break;
-
- case INPUT_EVENT_ES:
- event = new IMEvent( ItemEsChanged_Type, 0 );
- break;
- case INPUT_EVENT_TELETEXT:
- event = new IMEvent( ItemTeletextChanged_Type, 0 );
- break;
-
- case INPUT_EVENT_VOUT:
- event = new IMEvent( InterfaceVoutUpdate_Type, 0 );
- break;
-
- case INPUT_EVENT_STATISTICS:
- event = new IMEvent( StatisticsUpdate_Type, 0 );
- break;
-
- case INPUT_EVENT_ITEM_META: /* Codec MetaData + Art */
- event = new IMEvent( MetaChanged_Type, 0 );
- break;
- case INPUT_EVENT_ITEM_INFO: /* Codec Info */
- event = new IMEvent( InfoChanged_Type, 0 );
- break;
- case INPUT_EVENT_ITEM_NAME:
- event = new IMEvent( NameChanged_Type, 0 );
- break;
-
- case INPUT_EVENT_PROGRAM:
- case INPUT_EVENT_RECORD:
- case INPUT_EVENT_SIGNAL:
- case INPUT_EVENT_AUDIO_DELAY:
- case INPUT_EVENT_SUBTITLE_DELAY:
- case INPUT_EVENT_BOOKMARK:
- case INPUT_EVENT_CACHE:
- default:
- event = NULL;
- break;
- }
-
- if( event )
- QApplication::postEvent( im, static_cast<QEvent*>(event) );
- return VLC_SUCCESS;
+ var_SetBool( THEPL, "play-and-exit", b_exit );
}
-/* MIM */
+/* Static callbacks for MIM */
static int PLItemChanged( vlc_object_t *p_this, const char *psz_var,
- vlc_value_t oldval, vlc_value_t newval, void *param )
+ vlc_value_t oldval, vlc_value_t, void *param )
{
MainInputManager *mim = (MainInputManager*)param;
- IMEvent *event = new IMEvent( ItemChanged_Type, newval.i_int );
- QApplication::postEvent( mim, static_cast<QEvent*>(event) );
+ IMEvent *event = new IMEvent( ItemChanged_Type );
+ QApplication::postEvent( mim, event );
return VLC_SUCCESS;
}
{
MainInputManager *mim = (MainInputManager*)param;
- IMEvent *event = new IMEvent( VolumeChanged_Type, newval.i_int );
- QApplication::postEvent( mim, static_cast<QEvent*>(event) );
+ IMEvent *event = new IMEvent( VolumeChanged_Type );
+ QApplication::postEvent( mim, event );
return VLC_SUCCESS;
}
-
projects / vlc / blobdiff