QObject( parent ), p_intf( _p_intf )
{
i_old_playing_status = END_S;
- old_name = "";
- p_input = NULL;
- i_rate = 0;
+ b_had_audio = b_had_video = b_has_audio = b_has_video = false;
+ old_name = "";
+ artUrl = "";
+ p_input = NULL;
+ i_rate = 0;
+ i_input_id = 0;
}
InputManager::~InputManager()
delInput();
p_input = _p_input;
b_had_audio = b_had_video = b_has_audio = b_has_video = false;
- if( p_input )
+ if( p_input && !( p_input->b_dead || p_input->b_die ) )
{
vlc_object_yield( p_input );
emit statusChanged( PLAYING_S );
+ UpdateMeta();
+ UpdateTracks();
+ UpdateNavigation();
+ UpdateArt();
addCallbacks();
+ i_input_id = input_GetItem( p_input )->i_id;
+ }
+ else
+ {
+ p_input = NULL;
+ i_input_id = 0;
+ emit rateChanged( INPUT_RATE_DEFAULT );
}
}
if( p_input )
{
delCallbacks();
- vlc_object_release( p_input );
i_old_playing_status = END_S;
-
- old_name=qfu("");
- artUrl = qfu("");
+ i_input_id = 0;
+ old_name = "";
+ artUrl = "";
emit positionUpdated( 0.0, 0 ,0 );
emit statusChanged( END_S );
emit nameChanged( "" );
emit artChanged( "" );
+ emit rateChanged( INPUT_RATE_DEFAULT );
+ vlc_object_release( p_input );
p_input = NULL;
}
}
/* src/input/es-out.c:551 */
var_AddCallback( p_input, "video-es", ChangeVideo, this );
/* src/input/input.c:1765 */
- var_AddCallback( p_input, "rate", ItemRateChanged, this );
+ var_AddCallback( p_input, "rate-change", ItemRateChanged, this );
/* src/input/input.c:2003 */
var_AddCallback( p_input, "title", ItemTitleChanged, this );
/* src/input/input.c:734 for timers update*/
var_DelCallback( p_input, "audio-es", ChangeAudio, this );
var_DelCallback( p_input, "video-es", ChangeVideo, this );
var_DelCallback( p_input, "state", ItemStateChanged, this );
- var_DelCallback( p_input, "rate", ItemRateChanged, this );
+ var_DelCallback( p_input, "rate-change", ItemRateChanged, this );
var_DelCallback( p_input, "title", ItemTitleChanged, this );
var_DelCallback( p_input, "intf-change", InterfaceChanged, this );
}
void InputManager::customEvent( QEvent *event )
{
int type = event->type();
- //msg_Dbg( p_intf, "New IM Event of type: %i", type );
+ IMEvent *ple = static_cast<IMEvent *>(event);
+
if ( type != PositionUpdate_Type &&
type != ItemChanged_Type &&
type != ItemRateChanged_Type &&
type != ItemStateChanged_Type )
return;
- /* Delete the input */
- if( !p_input || p_input->b_dead || p_input->b_die )
- {
- delInput();
- return;
- }
+ if( !hasInput() ) return;
+
+ if( ( type != PositionUpdate_Type &&
+ type != ItemRateChanged_Type &&
+ type != ItemStateChanged_Type
+ )
+ && ( i_input_id != ple->i_id ) )
+ return;
+
+ if( type != PositionUpdate_Type )
+ msg_Dbg( p_intf, "New Event: type %i", type );
/* Actions */
switch( type )
break;
case ItemChanged_Type:
UpdateMeta();
- UpdateTitle();
+ UpdateNavigation();
+ UpdateTracks();
+ UpdateStatus();
UpdateArt();
break;
case ItemRateChanged_Type:
UpdateRate();
break;
case ItemTitleChanged_Type:
- UpdateTitle();
+ UpdateNavigation();
+ UpdateMeta();
break;
case ItemStateChanged_Type:
- UpdateStatus();
- break;
+ UpdateTracks();
+ UpdateStatus();
+ break;
}
}
void InputManager::UpdatePosition()
{
- /* Update position */
- int i_length, i_time; /* Int is enough, since we store seconds */
- float f_pos;
- i_length = var_GetTime( p_input , "length" ) / 1000000;
- i_time = var_GetTime( p_input , "time") / 1000000;
- f_pos = var_GetFloat( p_input , "position" );
- emit positionUpdated( f_pos, i_time, i_length );
+ /* Update position */
+ int i_length, i_time; /* Int is enough, since we store seconds */
+ float f_pos;
+ i_length = var_GetTime( p_input , "length" ) / 1000000;
+ i_time = var_GetTime( p_input , "time") / 1000000;
+ f_pos = var_GetFloat( p_input , "position" );
+ emit positionUpdated( f_pos, i_time, i_length );
}
-void InputManager::UpdateTitle()
+void InputManager::UpdateNavigation()
{
- /* Update navigation status */
- vlc_value_t val; val.i_int = 0;
- var_Change( p_input, "title", VLC_VAR_CHOICESCOUNT, &val, NULL );
- if( 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 );
- }
- else
- {
- emit navigationChanged( 0 );
- }
+ /* Update navigation status */
+ vlc_value_t val; val.i_int = 0;
+ var_Change( p_input, "title", VLC_VAR_CHOICESCOUNT, &val, NULL );
+ if( 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 );
+ }
+ else
+ {
+ emit navigationChanged( 0 );
+ }
}
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 )
- {
- i_old_playing_status = val.i_int;
- emit statusChanged( val.i_int );
- }
+ /* 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 )
+ {
+ i_old_playing_status = val.i_int;
+ emit statusChanged( val.i_int );
+ }
}
void InputManager::UpdateRate()
{
- /* Update Rate */
- 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 Rate */
+ 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()
emit nameChanged( text );
old_name=text;
}
+}
+void InputManager::UpdateTracks()
+{
/* Has Audio, has Video Tracks ? */
vlc_value_t val;
var_Change( p_input, "audio-es", VLC_VAR_CHOICESCOUNT, &val, NULL );
var_Change( p_input, "video-es", VLC_VAR_CHOICESCOUNT, &val, NULL );
b_has_video = val.i_int > 0;
+ msg_Dbg( p_input, "I have audio-video: %i %i", b_has_audio, b_has_video );
+
/* Update ZVBI status */
#ifdef ZVBI_COMPILED
/* Update teletext status*/
#endif
}
-void UpdateArt()
+void InputManager::UpdateArt()
{
/* Update Art meta */
QString url;
if( artUrl != url )
{
artUrl = url.replace( "file://",QString("" ) );
+ /* Taglib seems to define a attachment://, It won't work yet */
+ artUrl = url.replace( "attachment://",QString("" ) );
emit artChanged( artUrl );
msg_Dbg( p_intf, "Art: %s", qtu( artUrl ) );
}
void InputManager::telexToggle( bool b_enabled )
{
- int i_page = 0;
+ int i_page = b_enabled ? 100 : 0 ;
- if( b_enabled )
- i_page = 100;
telexGotoPage( i_page );
}
p_input = NULL;
im = new InputManager( this, p_intf );
- var_AddCallback( THEPL, "item-change", PLItemChanged, this );
+// 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_AddCallback( THEPL, "playlist-current", ItemChanged, im );
-
var_AddCallback( p_intf->p_libvlc, "volume-change", VolumeChanged, this );
// No necessary, I think TODO REMOVE ME at the end
{
if( p_input )
{
+ 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, "playlist-current", PLItemChanged, this );
var_DelCallback( THEPL, "activity", PLItemChanged, this );
- var_DelCallback( THEPL, "item-change", PLItemChanged, this );
+ var_DelCallback( THEPL, "item-change", ItemChanged, im );
+// var_DelCallback( THEPL, "item-change", PLItemChanged, this );
- var_DelCallback( THEPL, "playlist-current", ItemChanged, im );
+ var_DelCallback( THEPL, "playlist-current", PLItemChanged, this );
}
void MainInputManager::customEvent( QEvent *event )
{
int type = event->type();
- //msg_Dbg( p_intf, "New MainIM Event of type: %i", type );
if ( type != ItemChanged_Type && type != VolumeChanged_Type )
return;
+ // msg_Dbg( p_intf, "New MainIM Event of type: %i", type );
if( type == VolumeChanged_Type )
{
emit volumeChanged();
vlc_mutex_lock( &p_intf->change_lock );
if( p_input && ( p_input->b_dead || p_input->b_die ) )
{
- im->delInput();
+ 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;
}
if( !p_input )
p_input = THEPL->p_input;
if( p_input && !( p_input->b_die || p_input->b_dead) )
{
+ vlc_object_yield( p_input );
+ var_AddCallback( p_input, "state", PLItemChanged, this );
emit inputChanged( p_input );
}
else
static int counter = 0;
InputManager *im = (InputManager*)param;
- counter = counter++ % 4;
+ counter = ++counter % 4;
if(!counter)
return VLC_SUCCESS;
IMEvent *event = new IMEvent( PositionUpdate_Type, 0 );
}
static int ItemStateChanged( 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 newval, void *param )
{
InputManager *im = (InputManager*)param;
}
static int ItemRateChanged( 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 newval, void *param )
{
InputManager *im = (InputManager*)param;
}
static int ItemTitleChanged( 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 newval, void *param )
{
InputManager *im = (InputManager*)param;
projects / vlc / blobdiff