#endif
#include "input_manager.hpp"
+#include <vlc_keys.h>
+#include <vlc_url.h>
#include <QApplication>
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 *,
+ vlc_value_t, vlc_value_t, void * );
+static int PLItemRemoved( vlc_object_t *, const char *,
+ vlc_value_t, vlc_value_t, void * );
static int VolumeChanged( vlc_object_t *, const char *,
vlc_value_t, vlc_value_t, void * );
+static int SoundMuteChanged( vlc_object_t *, const char *,
+ vlc_value_t, vlc_value_t, void * );
+
+static int RandomChanged( vlc_object_t *, const char *,
+ vlc_value_t, vlc_value_t, void * );
+static int LoopChanged( vlc_object_t *, const char *,
+ vlc_value_t, vlc_value_t, void * );
+static int RepeatChanged( vlc_object_t *, const char *,
+ vlc_value_t, vlc_value_t, void * );
+
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 * );
/**********************************************************************
oldName = "";
artUrl = "";
p_input = NULL;
+ p_input_vbi = 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()
UpdateNavigation();
UpdateVout();
addCallbacks();
- i_input_id = input_GetItem( p_input )->i_id;
+ p_item = input_GetItem( p_input );
+ emit rateChanged( INPUT_RATE_DEFAULT / var_GetFloat( p_input, "rate" ) );
}
else
{
p_input = NULL;
- i_input_id = 0;
- emit rateChanged( INPUT_RATE_DEFAULT );
+ p_item = NULL;
+ assert( !p_input_vbi );
+ emit rateChanged( INPUT_RATE_DEFAULT / var_InheritFloat( p_intf, "rate" ) );
}
}
delCallbacks();
i_old_playing_status = END_S;
- i_input_id = 0;
+ p_item = NULL;
oldName = "";
artUrl = "";
b_video = false;
timeA = 0;
timeB = 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( INPUT_RATE_DEFAULT / var_InheritFloat( p_intf, "rate" ) );
emit nameChanged( "" );
emit chapterChanged( 0 );
emit titleChanged( 0 );
/* Reset all InfoPanels but stats */
emit artChanged( NULL );
emit infoChanged( NULL );
- emit metaChanged( NULL );
+ emit currentMetaChanged( (input_item_t *)NULL );
+
+ emit encryptionChanged( false );
+ emit recordingStateChanged( false );
+
+ emit cachingChanged( 1 );
}
/* Convert the event from the callbacks in actions */
int i_type = event->type();
IMEvent *ple = static_cast<IMEvent *>(event);
- assert( !( 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 &&
- i_type != SynchroChanged_Type &&
- i_type != CachingEvent_Type &&
- i_type != BookmarksChanged_Type &&
- i_type != InterfaceAoutUpdate_Type &&
- i_type != RecordingEvent_Type ) );
-
- if( !hasInput() ) return;
-
- if( i_type == CachingEvent_Type )
- UpdateCaching();
+ if( i_type == ItemChanged_Type )
+ UpdateMeta( ple->p_item );
- 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_type != SynchroChanged_Type &&
- i_type != BookmarksChanged_Type &&
- i_type != InterfaceAoutUpdate_Type &&
- i_type != RecordingEvent_Type
- )
- && ( i_input_id != ple->i_id ) )
+ if( !hasInput() )
return;
-#ifndef NDEBUG
- if( i_type != PositionUpdate_Type &&
- i_type != StatisticsUpdate_Type )
- msg_Dbg( p_intf, "New Event: type %i", i_type );
-#endif
-
/* 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 RecordingEvent_Type:
UpdateRecord();
break;
+ case ProgramChanged_Type:
+ UpdateProgramEvent();
+ break;
default:
msg_Warn( p_intf, "This shouldn't happen: %i", i_type );
+ assert(0);
}
}
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, newval.i_int );
- QApplication::postEvent( im, static_cast<QEvent*>(event) );
+ IMEvent *event = new IMEvent( ItemChanged_Type, p_item );
+ QApplication::postEvent( im, event );
return VLC_SUCCESS;
}
switch( newval.i_int )
{
case INPUT_EVENT_STATE:
- event = new IMEvent( ItemStateChanged_Type, 0 );
+ event = new IMEvent( ItemStateChanged_Type );
break;
case INPUT_EVENT_RATE:
- event = new IMEvent( ItemRateChanged_Type, 0 );
+ event = new IMEvent( ItemRateChanged_Type );
break;
- case INPUT_EVENT_TIMES:
- event = new IMEvent( PositionUpdate_Type, 0 );
+ 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, 0 );
+ event = new IMEvent( ItemTitleChanged_Type );
break;
case INPUT_EVENT_ES:
- event = new IMEvent( ItemEsChanged_Type, 0 );
+ event = new IMEvent( ItemEsChanged_Type );
break;
case INPUT_EVENT_TELETEXT:
- event = new IMEvent( ItemTeletextChanged_Type, 0 );
+ event = new IMEvent( ItemTeletextChanged_Type );
break;
case INPUT_EVENT_STATISTICS:
- event = new IMEvent( StatisticsUpdate_Type, 0 );
+ event = new IMEvent( StatisticsUpdate_Type );
break;
case INPUT_EVENT_VOUT:
- event = new IMEvent( InterfaceVoutUpdate_Type, 0 );
+ event = new IMEvent( InterfaceVoutUpdate_Type );
break;
case INPUT_EVENT_AOUT:
- event = new IMEvent( InterfaceAoutUpdate_Type, 0 );
+ event = new IMEvent( InterfaceAoutUpdate_Type );
break;
case INPUT_EVENT_ITEM_META: /* Codec MetaData + Art */
- event = new IMEvent( MetaChanged_Type, 0 );
+ event = new IMEvent( MetaChanged_Type );
break;
case INPUT_EVENT_ITEM_INFO: /* Codec Info */
- event = new IMEvent( InfoChanged_Type, 0 );
+ event = new IMEvent( InfoChanged_Type );
break;
case INPUT_EVENT_ITEM_NAME:
- event = new IMEvent( NameChanged_Type, 0 );
+ event = new IMEvent( NameChanged_Type );
break;
case INPUT_EVENT_AUDIO_DELAY:
case INPUT_EVENT_SUBTITLE_DELAY:
- event = new IMEvent( SynchroChanged_Type, 0 );
+ event = new IMEvent( SynchroChanged_Type );
break;
case INPUT_EVENT_CACHE:
- event = new IMEvent( CachingEvent_Type, 0 );
+ event = new IMEvent( CachingEvent_Type );
break;
case INPUT_EVENT_BOOKMARK:
- event = new IMEvent( BookmarksChanged_Type, 0 );
+ event = new IMEvent( BookmarksChanged_Type );
break;
case INPUT_EVENT_RECORD:
- event = new IMEvent( RecordingEvent_Type, 0 );
+ event = new IMEvent( RecordingEvent_Type );
break;
case INPUT_EVENT_PROGRAM:
/* This is for PID changes */
- /* event = new IMEvent( ProgramChanged_Type, 0 );
- break; */
+ event = new IMEvent( ProgramChanged_Type );
+ break;
+
case INPUT_EVENT_SIGNAL:
/* This is for capture-card signals */
- /* event = new IMEvent( SignalChanged_Type, 0 );
+ /* event = new IMEvent( SignalChanged_Type );
break; */
default:
event = NULL;
}
if( event )
- QApplication::postEvent( im, static_cast<QEvent*>(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()
{
/* Update position */
- int i_length, i_time; /* Int is enough, since we store seconds */
+ int i_length;
+ int64_t i_time;
float f_pos;
i_length = var_GetTime( p_input , "length" ) / 1000000;
- i_time = var_GetTime( p_input , "time") / 1000000;
+ i_time = var_GetTime( p_input , "time");
f_pos = var_GetFloat( p_input , "position" );
emit positionUpdated( f_pos, i_time, i_length );
}
{
/* 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 );
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 );
+ 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: %i", val2.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 );
}
}
void InputManager::UpdateRate()
{
/* Update Rate */
- int i_new_rate = var_GetInteger( p_input, "rate");
+ int i_new_rate = INPUT_RATE_DEFAULT / var_GetFloat( p_input, "rate" );
if( i_new_rate != i_rate )
{
i_rate = i_new_rate;
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;
+
+ 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_input_vbi )
+ {
+ /* This callback is not remove explicitly, but interfaces
+ * are guaranted to outlive input */
+ var_AddCallback( p_input_vbi, "vbi-page", VbiEvent, this );
+
+ 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 );
+
+ }
+ emit teletextActivated( b_enabled && i_teletext_es >= 0 );
+ }
else
- telexActivation( false );
+ {
+ emit teletextActivated( false );
+ emit teletextPossible( false );
+ }
}
void InputManager::UpdateVout()
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 ) );
- url = psz_art;
+ char *psz = make_path( psz_art );
free( psz_art );
+ psz_art = psz;
}
- url = url.replace( "file://", QString("" ) );
+
+#if 0
/* Taglib seems to define a attachment://, It won't work yet */
- url = url.replace( "attachment://", QString("" ) );
+ url = url.replace( "attachment://", "" );
+#endif
+ return qfu( psz_art ? psz_art : "" );
+}
+
+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;
+
/* Update Art meta */
- emit artChanged( url );
+ artUrl = url;
+ emit artChanged( artUrl );
}
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()
}
}
+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 )
{
if( hasInput() )
var_SetFloat( p_input, "position", new_pos );
+ emit seekRequested( 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 );
}
}
/* 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" );
- 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 );
- 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_ANYWHERE );
- 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::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 );
}
}
{
if( hasInput() )
{
- int i_rate = var_GetInteger( p_input, "rate" );
- var_SetInteger( p_input, "rate", -i_rate );
+ float f_rate = var_GetFloat( p_input, "rate" );
+ var_SetFloat( p_input, "rate", -f_rate );
}
}
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()
{
if( hasInput() )
- var_SetInteger( p_input, "rate", INPUT_RATE_DEFAULT );
+ var_SetFloat( p_input, "rate", 1. );
}
void InputManager::setRate( int new_rate )
{
if( hasInput() )
- var_SetInteger( p_input, "rate", new_rate );
+ var_SetFloat( p_input, "rate",
+ (float)INPUT_RATE_DEFAULT / (float)new_rate );
+}
+
+void InputManager::jumpFwd()
+{
+ int i_interval = var_InheritInteger( 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 = var_InheritInteger( 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()
{
timeB = var_GetTime( THEMIM->getInput(), "time" );
var_SetTime( THEMIM->getInput(), "time" , timeA );
+ CONNECT( this, positionUpdated( float, int64_t, int ),
+ this, AtoBLoop( float, int64_t, int ) );
}
else
{
timeA = 0;
timeB = 0;
+ disconnect( this, SIGNAL( positionUpdated( float, int64_t, int ) ),
+ this, SLOT( AtoBLoop( float, int64_t, 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, int64_t i_time, int )
{
if( timeB )
{
- if( ( i_time >= (int)( timeB/1000000 ) )
- || ( i_time < (int)( timeA/1000000 ) ) )
+ if( i_time >= timeB || i_time < timeA )
var_SetTime( THEMIM->getInput(), "time" , timeA );
}
}
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( 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( 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 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()
vlc_object_release( p_input );
}
- var_DelCallback( p_intf->p_libvlc, "volume-change", VolumeChanged, 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 );
+ var_DelCallback( THEPL, "playlist-item-deleted", PLItemRemoved, this );
+ var_DelCallback( THEPL, "random", RandomChanged, this );
+ var_DelCallback( THEPL, "repeat", RepeatChanged, this );
+ var_DelCallback( THEPL, "loop", LoopChanged, this );
- var_DelCallback( THEPL, "playlist-current", PLItemChanged, this );
}
vout_thread_t* MainInputManager::getVout()
void MainInputManager::customEvent( QEvent *event )
{
int type = event->type();
- if ( type != ItemChanged_Type && type != VolumeChanged_Type )
- return;
+
+ PLEvent *plEv;
+ IMEvent *imEv;
// msg_Dbg( p_intf, "New MainIM Event of type: %i", type );
- if( type == VolumeChanged_Type )
+ switch( type )
{
+ case VolumeChanged_Type:
emit volumeChanged();
return;
+ case SoundMuteChanged_Type:
+ emit soundMuteChanged();
+ return;
+ case PLItemAppended_Type:
+ plEv = static_cast<PLEvent*>( event );
+ emit playlistItemAppended( plEv->i_item, plEv->i_parent );
+ return;
+ case PLItemRemoved_Type:
+ plEv = static_cast<PLEvent*>( event );
+ emit playlistItemRemoved( plEv->i_item );
+ return;
+ case RandomChanged_Type:
+ emit randomChanged( var_GetBool( THEPL, "random" ) );
+ return;
+ case LoopChanged_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;
}
/* 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( NULL );
+ emit inputChanged( p_input );
var_DelCallback( p_input, "state", PLItemChanged, this );
vlc_object_release( p_input );
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 );
+ p_input = playlist_CurrentInput( pl_Get(p_intf) );
if( p_input )
{
emit inputChanged( p_input );
- vlc_object_release( p_input );
}
- pl_Release( p_intf );
}
}
getIM()->togglePlayPause();
}
-/* Static callbacks for MIM */
+void MainInputManager::play()
+{
+ /* No input, play */
+ if( !p_input )
+ playlist_Play( THEPL );
+ else
+ {
+ if( PLAYING_S != var_GetInteger( p_input, "state" ) )
+ {
+ getIM()->togglePlayPause();
+ }
+ }
+}
+
+void MainInputManager::pause()
+{
+ if(p_input && PLAYING_S == var_GetInteger( p_input, "state" ) )
+ {
+ getIM()->togglePlayPause();
+ }
+}
+
+void MainInputManager::toggleRandom()
+{
+ var_ToggleBool( THEPL, "random" );
+}
+
+void MainInputManager::notifyRepeatLoop()
+{
+ int i_value = var_GetBool( THEPL, "loop" ) * REPEAT_ONE
+ + var_GetBool( THEPL, "repeat" ) * REPEAT_ALL;
+
+ emit repeatLoopChanged( i_value );
+}
+
+void MainInputManager::loopRepeatLoopStatus()
+{
+ /* Toggle Normal -> Loop -> Repeat -> Normal ... */
+ if( var_GetBool( THEPL, "repeat" ) )
+ var_SetBool( THEPL, "repeat", false );
+ else if( var_GetBool( THEPL, "loop" ) )
+ {
+ var_SetBool( THEPL, "loop", false );
+ var_SetBool( THEPL, "repeat", true );
+ }
+ else
+ var_SetBool( THEPL, "loop", true );
+}
+
+void MainInputManager::activatePlayQuit( bool b_exit )
+{
+ var_SetBool( THEPL, "play-and-exit", b_exit );
+}
+
+
+/****************************
+ * Static callbacks for MIM *
+ ****************************/
static int PLItemChanged( vlc_object_t *p_this, const char *psz_var,
+ vlc_value_t oldval, vlc_value_t, void *param )
+{
+ MainInputManager *mim = (MainInputManager*)param;
+
+ IMEvent *event = new IMEvent( ItemChanged_Type );
+ QApplication::postEvent( mim, event );
+ 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( ItemChanged_Type, newval.i_int );
- QApplication::postEvent( mim, static_cast<QEvent*>(event) );
+ IMEvent *event = new IMEvent( LeafToParent_Type,
+ static_cast<input_item_t*>( newval.p_address ) );
+ 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;
+}
+
+static int SoundMuteChanged( 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( SoundMuteChanged_Type );
+ QApplication::postEvent( mim, event );
+ return VLC_SUCCESS;
+}
+
+static int PLItemAppended
+( vlc_object_t * obj, const char *var, vlc_value_t old, vlc_value_t cur, void *data )
+{
+ MainInputManager *mim = static_cast<MainInputManager*>(data);
+ playlist_add_t *p_add = static_cast<playlist_add_t*>( cur.p_address );
+
+ PLEvent *event = new PLEvent( PLItemAppended_Type, p_add->i_item, p_add->i_node );
+ QApplication::postEvent( mim, event );
+ return VLC_SUCCESS;
+}
+static int PLItemRemoved
+( vlc_object_t * obj, const char *var, vlc_value_t old, vlc_value_t cur, void *data )
+{
+ MainInputManager *mim = static_cast<MainInputManager*>(data);
+
+ PLEvent *event = new PLEvent( PLItemRemoved_Type, cur.i_int, 0 );
+ QApplication::postEvent( mim, event );
return VLC_SUCCESS;
}
+static int RandomChanged
+( vlc_object_t * obj, const char *var, vlc_value_t old, vlc_value_t cur, void *data )
+{
+ MainInputManager *mim = static_cast<MainInputManager*>(data);
+
+ IMEvent *event = new IMEvent( RandomChanged_Type );
+ QApplication::postEvent( mim, event );
+ return VLC_SUCCESS;
+}
+
+/* Probably could be merged with next callback */
+static int LoopChanged
+( vlc_object_t * obj, const char *var, vlc_value_t old, vlc_value_t cur, void *data )
+{
+ MainInputManager *mim = static_cast<MainInputManager*>(data);
+
+ IMEvent *event = new IMEvent( LoopChanged_Type );
+ QApplication::postEvent( mim, event );
+ return VLC_SUCCESS;
+}
+
+static int RepeatChanged
+( vlc_object_t * obj, const char *var, vlc_value_t old, vlc_value_t cur, void *data )
+{
+ MainInputManager *mim = static_cast<MainInputManager*>(data);
+
+ IMEvent *event = new IMEvent( RepeatChanged_Type );
+ QApplication::postEvent( mim, event );
+ return VLC_SUCCESS;
+}
projects / vlc / blobdiff