* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#define __STDC_FORMAT_MACROS 1
+
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
static int ItemChanged( vlc_object_t *, const char *,
vlc_value_t, vlc_value_t, void * );
+static int LeafToParent( vlc_object_t *, const char *,
+ vlc_value_t, vlc_value_t, void * );
static int PLItemChanged( vlc_object_t *, const char *,
vlc_value_t, vlc_value_t, void * );
static int PLItemAppended( vlc_object_t *, const char *,
oldName = "";
artUrl = "";
p_input = NULL;
- i_rate = 0;
+ p_input_vbi = NULL;
+ f_rate = 0.;
p_item = NULL;
b_video = false;
timeA = 0;
{
msg_Dbg( p_intf, "IM: Setting an input" );
vlc_object_hold( p_input );
- emit statusChanged( PLAYING_S );
+ addCallbacks();
+ UpdateStatus();
UpdateName();
UpdateArt();
UpdateTeletext();
UpdateNavigation();
UpdateVout();
- addCallbacks();
+
p_item = input_GetItem( p_input );
+ emit rateChanged( var_GetFloat( p_input, "rate" ) );
}
else
{
p_input = NULL;
p_item = NULL;
- emit rateChanged( INPUT_RATE_DEFAULT );
+ assert( !p_input_vbi );
+ emit rateChanged( var_InheritFloat( p_intf, "rate" ) );
}
}
b_video = false;
timeA = 0;
timeB = 0;
+ f_rate = 0. ;
+
+ if( p_input_vbi )
+ {
+ vlc_object_release( p_input_vbi );
+ p_input_vbi = NULL;
+ }
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 rateChanged( var_InheritFloat( p_intf, "rate" ) );
emit nameChanged( "" );
emit chapterChanged( 0 );
emit titleChanged( 0 );
emit encryptionChanged( false );
emit recordingStateChanged( false );
+
+ emit cachingChanged( 1 );
}
/* Convert the event from the callbacks in actions */
case ProgramChanged_Type:
UpdateProgramEvent();
break;
+ case EPGEvent_Type:
+ UpdateEPG();
+ break;
default:
msg_Warn( p_intf, "This shouldn't happen: %i", i_type );
assert(0);
event = new IMEvent( ProgramChanged_Type );
break;
+ case INPUT_EVENT_ITEM_EPG:
+ /* EPG data changed */
+ event = new IMEvent( EPGEvent_Type );
+ break;
+
case INPUT_EVENT_SIGNAL:
/* This is for capture-card signals */
/* event = new IMEvent( SignalChanged_Type );
{
/* Update navigation status */
vlc_value_t val; val.i_int = 0;
+ vlc_value_t val2; val2.i_int = 0;
if( hasInput() )
var_Change( p_input, "title", VLC_VAR_CHOICESCOUNT, &val, NULL );
if( val.i_int > 0 )
{
emit titleChanged( true );
- msg_Dbg( p_intf, "Title %i", val.i_int );
+ msg_Dbg( p_intf, "Title %"PRId64, 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 );
+ var_Change( p_input, "chapter", VLC_VAR_CHOICESCOUNT, &val2, NULL );
+ emit chapterChanged( (val2.i_int > 1) || ( val2.i_int > 0 && val.i_int > 1 ) );
+ msg_Dbg( p_intf, "Chapter: %"PRId64, val2.i_int );
}
else
emit titleChanged( false );
void InputManager::UpdateRate()
{
/* Update Rate */
- int i_new_rate = INPUT_RATE_DEFAULT / var_GetFloat( p_input, "rate" );
- if( i_new_rate != i_rate )
+ float f_new_rate = var_GetFloat( p_input, "rate" );
+ if( f_new_rate != f_rate )
{
- i_rate = i_new_rate;
+ f_rate = f_new_rate;
/* Update rate */
- emit rateChanged( i_rate );
+ emit rateChanged( f_rate );
}
}
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_input_vbi )
+ {
+ var_DelCallback( p_input_vbi, "vbi-page", VbiEvent, this );
+ vlc_object_release( p_input_vbi );
+ }
+
+ if( input_GetEsObjects( p_input, i_teletext_es, &p_input_vbi, NULL, NULL ) )
+ p_input_vbi = NULL;
- if( p_vbi )
+ if( p_input_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 );
+ var_AddCallback( p_input_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 );
+ i_page = var_GetInteger( p_input_vbi, "vbi-page" );
+ b_transparent = !var_GetBool( p_input_vbi, "vbi-opaque" );
}
emit newTelexPageSet( i_page );
emit teletextTransparencyActivated( b_transparent );
}
}
+void InputManager::UpdateEPG()
+{
+ if( hasInput() )
+ {
+ emit epgChanged();
+ }
+}
+
void InputManager::UpdateVout()
{
if( hasInput() )
{
/* Get current vout lists from input */
- int i_vout;
+ size_t i_vout;
vout_thread_t **pp_vout;
if( input_Control( p_input, INPUT_GET_VOUTS, &pp_vout, &i_vout ) )
{
if( f_newCache != f_cache )
{
f_cache = f_newCache;
- /* Update rate */
+ /* Update cache */
emit cachingChanged( f_cache );
}
}
{
if( hasInput() )
{
- playlist_t *p_playlist = pl_Hold( p_intf );
- playlist_AskForArtEnqueue( p_playlist, input_GetItem( p_input ), pl_Unlocked );
- pl_Release( p_intf );
+ playlist_AskForArtEnqueue( pl_Get(p_intf), input_GetItem( p_input ) );
}
else
{
}
}
-void InputManager::UpdateArt()
+const QString InputManager::decodeArtURL( input_item_t *p_item )
{
- QString url;
+ assert( p_item );
- if( hasInput() )
+ char *psz_art = input_item_GetArtURL( p_item );
+ if( psz_art )
{
- 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
+ char *psz = make_path( psz_art );
free( psz_art );
-
- url = url.replace( "file://", "" );
- /* Taglib seems to define a attachment://, It won't work yet */
- url = url.replace( "attachment://", "" );
+ psz_art = psz;
}
+#if 0
+ /* Taglib seems to define a attachment://, It won't work yet */
+ url = url.replace( "attachment://", "" );
+#endif
+
+ QString path = qfu( psz_art ? psz_art : "" );
+ free( psz_art );
+ return path;
+}
+
+void InputManager::UpdateArt()
+{
+ QString url;
+
+ if( hasInput() )
+ url = decodeArtURL( input_GetItem( p_input ) );
+
/* the art hasn't changed, no need to update */
if(artUrl == url)
return;
{
if( hasInput() )
var_SetFloat( p_input, "position", new_pos );
+ emit seekRequested( new_pos );
}
/* User togglePlayPause */
int state = var_GetInteger( p_input, "state" );
state = ( state != PLAYING_S ) ? PLAYING_S : PAUSE_S;
var_SetInteger( p_input, "state", state );
- emit statusChanged( state );
}
}
/* Set a new Teletext Page */
void InputManager::telexSetPage( int page )
{
- if( hasInput() )
+ if( hasInput() && p_input_vbi )
{
const int i_teletext_es = var_GetInteger( p_input, "teletext-es" );
if( i_teletext_es >= 0 )
{
- vlc_object_t *p_vbi = (vlc_object_t *) vlc_object_find_name( p_input,
- "zvbi", FIND_CHILD );
- if( p_vbi )
- {
- var_SetInteger( p_vbi, "vbi-page", page );
- vlc_object_release( p_vbi );
- emit newTelexPageSet( page );
- }
+ var_SetInteger( p_input_vbi, "vbi-page", page );
+ emit newTelexPageSet( page );
}
}
}
/* Set the transparency on teletext */
void InputManager::telexSetTransparency( bool b_transparentTelextext )
{
- if( hasInput() )
+ if( hasInput() && p_input_vbi )
{
- vlc_object_t *p_vbi = (vlc_object_t *) vlc_object_find_name( p_input,
- "zvbi", FIND_CHILD );
- if( p_vbi )
- {
- var_SetBool( p_vbi, "vbi-opaque", !b_transparentTelextext );
- vlc_object_release( p_vbi );
- emit teletextTransparencyActivated( b_transparentTelextext );
- }
+ var_SetBool( p_input_vbi, "vbi-opaque", !b_transparentTelextext );
+ emit teletextTransparencyActivated( b_transparentTelextext );
}
}
void InputManager::jumpFwd()
{
- int i_interval = config_GetInt( p_input, "short-jump-size" );
+ int i_interval = var_InheritInteger( p_input, "short-jump-size" );
if( i_interval > 0 )
{
mtime_t val = (mtime_t)(i_interval) * 1000000L;
void InputManager::jumpBwd()
{
- int i_interval = config_GetInt( p_input, "short-jump-size" );
+ int i_interval = var_InheritInteger( p_input, "short-jump-size" );
if( i_interval > 0 )
{
mtime_t val = -1 *(mtime_t)(i_interval) * 1000000L;
var_AddCallback( THEPL, "item-change", ItemChanged, im );
var_AddCallback( THEPL, "item-current", PLItemChanged, this );
var_AddCallback( THEPL, "activity", PLItemChanged, this );
+ var_AddCallback( THEPL, "leaf-to-parent", LeafToParent, this );
var_AddCallback( THEPL, "playlist-item-append", PLItemAppended, this );
var_AddCallback( THEPL, "playlist-item-deleted", PLItemRemoved, this );
var_AddCallback( THEPL, "random", RandomChanged, this );
var_AddCallback( THEPL, "repeat", RepeatChanged, this );
var_AddCallback( THEPL, "loop", LoopChanged, this );
- var_AddCallback( p_intf->p_libvlc, "volume-change", VolumeChanged, this );
- var_AddCallback( p_intf->p_libvlc, "volume-muted", SoundMuteChanged, this );
+ var_AddCallback( THEPL, "volume-change", VolumeChanged, this );
+ var_AddCallback( THEPL, "volume-muted", SoundMuteChanged, this );
/* Warn our embedded IM about input changes */
- CONNECT( this, inputChanged( input_thread_t * ),
- im, setInput( input_thread_t * ) );
+ DCONNECT( this, inputChanged( input_thread_t * ),
+ im, setInput( input_thread_t * ) );
/* emit check if playlist has already started playing */
input_thread_t *p_input = playlist_CurrentInput( THEPL );
vlc_object_release( p_input );
}
- var_DelCallback( p_intf->p_libvlc, "volume-change", VolumeChanged, this );
- var_DelCallback( p_intf->p_libvlc, "volume-muted", SoundMuteChanged, this );
+ var_DelCallback( THEPL, "volume-change", VolumeChanged, this );
+ var_DelCallback( THEPL, "volume-muted", SoundMuteChanged, this );
var_DelCallback( THEPL, "activity", PLItemChanged, this );
var_DelCallback( THEPL, "item-change", ItemChanged, im );
+ var_DelCallback( THEPL, "leaf-to-parent", LeafToParent, this );
var_DelCallback( THEPL, "item-current", PLItemChanged, this );
var_DelCallback( THEPL, "playlist-item-append", PLItemAppended, this );
int type = event->type();
PLEvent *plEv;
+ IMEvent *imEv;
// msg_Dbg( p_intf, "New MainIM Event of type: %i", type );
switch( type )
case RepeatChanged_Type:
notifyRepeatLoop();
return;
+ case LeafToParent_Type:
+ imEv = static_cast<IMEvent*>( event );
+ emit leafBecameParent( imEv->p_item );
default:
if( type != ItemChanged_Type ) return;
}
p_input = NULL;
}
/* we are working as a dialogs provider */
- playlist_t *p_playlist = pl_Hold( p_intf );
- p_input = playlist_CurrentInput( p_playlist );
+ p_input = playlist_CurrentInput( pl_Get(p_intf) );
if( p_input )
{
emit inputChanged( p_input );
}
- pl_Release( p_intf );
}
}
void MainInputManager::notifyRepeatLoop()
{
- int i_value = var_GetBool( THEPL, "loop" ) * REPEAT_ONE
- + var_GetBool( THEPL, "repeat" ) * REPEAT_ALL;
+ int i_value = var_GetBool( THEPL, "loop" ) * REPEAT_ALL
+ + var_GetBool( THEPL, "repeat" ) * REPEAT_ONE;
emit repeatLoopChanged( i_value );
}
return VLC_SUCCESS;
}
+static int LeafToParent( vlc_object_t *p_this, const char *psz_var,
+ vlc_value_t oldval, vlc_value_t newval, void *param )
+{
+ MainInputManager *mim = (MainInputManager*)param;
+
+ IMEvent *event = new IMEvent( LeafToParent_Type,
+ static_cast<input_item_t*>( newval.p_address ) );
+ QApplication::postEvent( mim, event );
+ return VLC_SUCCESS;
+}
+
static int VolumeChanged( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param )
{
projects / vlc / blobdiff