X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Finput_manager.cpp;h=9f65f792476bbc4b8a0b2cbf9434a258882d14e4;hb=41b3e1daced948f537c52209a9acdc2ce908687e;hp=2dfcf8d732e50e7ff0dcbd6722f3ff2b17de06f7;hpb=00b95848260cd44f140a05da8aa5baf13580e2d3;p=vlc diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp index 2dfcf8d732..9f65f79247 100644 --- a/modules/gui/qt4/input_manager.cpp +++ b/modules/gui/qt4/input_manager.cpp @@ -32,12 +32,20 @@ static int ChangeSPU( vlc_object_t *p_this, const char *var, vlc_value_t o, vlc_value_t n, void *param ); + +static int ChangeTeletext( vlc_object_t *p_this, const char *var, vlc_value_t o, + vlc_value_t n, void *param ); + static int ItemChanged( 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 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 *, vlc_value_t, vlc_value_t, void * ); static int ItemRateChanged( vlc_object_t *, const char *, @@ -58,12 +66,15 @@ InputManager::InputManager( QObject *parent, intf_thread_t *_p_intf) : 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_transparentTelextext = false; + b_video = false; + timeA = 0; + timeB = 0; + } InputManager::~InputManager() @@ -73,19 +84,20 @@ InputManager::~InputManager() /* Define the Input used. Add the callbacks on input - p_input is yield once here */ + p_input is held once here */ void InputManager::setInput( input_thread_t *_p_input ) { delInput(); p_input = _p_input; if( p_input && !( p_input->b_dead || !vlc_object_alive (p_input) ) ) { - vlc_object_yield( p_input ); + vlc_object_hold( p_input ); emit statusChanged( PLAYING_S ); UpdateMeta(); UpdateArt(); - UpdateSPU(); + UpdateTeletext(); UpdateNavigation(); + UpdateVout(); addCallbacks(); i_input_id = input_GetItem( p_input )->i_id; } @@ -94,7 +106,6 @@ void InputManager::setInput( input_thread_t *_p_input ) p_input = NULL; i_input_id = 0; emit rateChanged( INPUT_RATE_DEFAULT ); - emit inputUnset(); } } @@ -108,16 +119,20 @@ void InputManager::delInput() delCallbacks(); i_old_playing_status = END_S; i_input_id = 0; - old_name = ""; + oldName = ""; artUrl = ""; - emit positionUpdated( 0.0, 0 ,0 ); + b_video = false; + timeA = 0; + timeB = 0; + emit positionUpdated( -1.0, 0 ,0 ); emit statusChanged( END_S ); emit nameChanged( "" ); - emit artChanged( "" ); + emit artChanged( NULL ); emit rateChanged( INPUT_RATE_DEFAULT ); + emit voutChanged( false ); vlc_object_release( p_input ); p_input = NULL; - UpdateSPU(); + UpdateTeletext(); } } @@ -136,57 +151,86 @@ void InputManager::addCallbacks() 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 + * if there is new videotracks (mpeg-ts)*/ + var_AddCallback( p_input, "video-es", ItemStateChanged, this ); + /* src/input/es-out.c: */ + var_AddCallback( p_input, "teletext-es", ChangeTeletext, this ); /* src/input/input.c:1765 */ 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_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 ); } /* Delete the callbacks on Input. Self explanatory */ void InputManager::delCallbacks() { var_DelCallback( p_input, "spu-es", ChangeSPU, this ); + var_DelCallback( p_input, "video-es", ItemStateChanged, this ); + var_DelCallback( p_input, "teletext-es", ChangeTeletext, this ); var_DelCallback( p_input, "state", ItemStateChanged, 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(event); - if ( type != PositionUpdate_Type && - type != ItemChanged_Type && - type != ItemRateChanged_Type && - type != ItemTitleChanged_Type && - type != ItemSpuChanged_Type && - type != ItemStateChanged_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( i_type == ItemStateChanged_Type ) + { + UpdateNavigation(); + UpdateTeletext(); + } + if( !hasInput() ) return; - if( ( type != PositionUpdate_Type && - type != ItemRateChanged_Type && - type != ItemSpuChanged_Type && - type != ItemStateChanged_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(); @@ -207,9 +251,22 @@ void InputManager::customEvent( QEvent *event ) case ItemSpuChanged_Type: UpdateSPU(); break; + case ItemTeletextChanged_Type: + UpdateTeletext(); + break; + 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 */ @@ -225,17 +282,20 @@ 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( 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() @@ -267,6 +327,7 @@ void InputManager::UpdateMeta() /* Update text, name and nowplaying */ 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 ) ) { @@ -274,32 +335,41 @@ void InputManager::UpdateMeta() psz_name = input_item_GetName( input_GetItem( p_input ) ); } + /* Try to get the nowplaying */ char *psz_nowplaying = input_item_GetNowPlaying( input_GetItem( p_input ) ); if( !EMPTY_STR( psz_nowplaying ) ) { text.sprintf( "%s - %s", psz_nowplaying, psz_name ); } - else + else /* Do it ourself */ { char *psz_artist = input_item_GetArtist( input_GetItem( p_input ) ); + if( !EMPTY_STR( psz_artist ) ) - { text.sprintf( "%s - %s", psz_artist, psz_name ); - } else - { text.sprintf( "%s", psz_name ); - } + free( psz_artist ); } + /* Free everything */ free( psz_name ); free( psz_nowplaying ); - if( old_name != text ) + /* If we have Nothing */ + if( text.isEmpty() ) + { + psz_name = input_item_GetURI( input_GetItem( p_input ) ); + text.sprintf( "%s", psz_name ); + text = text.remove( 0, text.lastIndexOf( DIR_SEP ) + 1 ); + free( psz_name ); + } + + if( oldName != text ) { emit nameChanged( text ); - old_name=text; + oldName=text; } } @@ -314,47 +384,39 @@ bool InputManager::hasAudio() return false; } -bool InputManager::hasVideo() +void InputManager::UpdateSPU() { - if( hasInput() ) - { - vlc_value_t val; - var_Change( p_input, "video-es", VLC_VAR_CHOICESCOUNT, &val, NULL ); - return val.i_int > 0; - } - return false; - + UpdateTeletext(); } -void InputManager::UpdateSPU() +void InputManager::UpdateTeletext() { if( hasInput() ) - { - vlc_value_t val; - var_Change( p_input, "spu-es", VLC_VAR_CHOICESCOUNT, &val, NULL ); - telexToggle( val.i_int > 0 ); - } + telexActivation( var_GetInteger( p_input, "teletext-es" ) >= 0 ); else + telexActivation( false ); +} + +void InputManager::UpdateVout() +{ + if( hasInput() ) { - telexToggle( false ); + bool b_old_video = b_video; + + 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 ); + if( !!b_old_video != !!b_video ) + emit voutChanged( b_video ); } } void InputManager::UpdateArt() { /* Update Art meta */ - QString url; - char *psz_art = input_item_GetArtURL( input_GetItem( p_input ) ); - url.sprintf("%s", psz_art ); - free( psz_art ); - 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 ) ); - } + emit artChanged( input_GetItem( p_input ) ); } /* User update of the slider */ @@ -368,10 +430,13 @@ void InputManager::sliderUpdate( float new_pos ) 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() @@ -400,70 +465,111 @@ void InputManager::sectionMenu() { if( hasInput() ) { - vlc_value_t val; val.i_int = 2; - var_Set( p_input, "title 0", val ); + 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; + 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; + } + var_Change( p_input, "title 0", VLC_VAR_FREELIST, &val, &text ); + + var_Set( p_input, "title 0", root ); } } -void InputManager::telexGotoPage( int page ) +/* + * Teletext Functions + */ + +/* Set a new Teletext Page */ +void InputManager::telexSetPage( int page ) { if( hasInput() ) { - vlc_object_t *p_vbi; - p_vbi = (vlc_object_t *) vlc_object_find_name( p_input, - "zvbi", FIND_ANYWHERE ); - if( p_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 ) { - var_SetInteger( p_vbi, "vbi-page", page ); - vlc_object_release( p_vbi ); + 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 ) { - int i_page = 100; - if( hasInput() ) { - vlc_value_t val; - vlc_object_t *p_vbi; - var_Change( p_input, "spu-es", VLC_VAR_CHOICESCOUNT, &val, NULL ); - b_enabled = (val.i_int > 0); - 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 ) { - i_page = var_GetInteger( p_vbi, "vbi-page" ); + var_SetBool( p_vbi, "vbi-opaque", b_transparentTelextext ); vlc_object_release( p_vbi ); - i_page = b_enabled ? i_page : 0; - telexGotoPage( i_page ); + emit teletextTransparencyActivated( b_transparentTelextext ); } } - emit teletextEnabled( b_enabled ); } -void InputManager::telexToggleButtons() +void InputManager::telexActivation( bool b_enabled ) { - emit toggleTelexButtons(); + 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 teletextPossible( b_enabled ); + if( !b_enabled ) return; + + /* If Teletext is selected */ + if( i_teletext_es == i_spu_es ) + { + /* 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 ) + { + i_page = var_GetInteger( p_vbi, "vbi-page" ); + vlc_object_release( p_vbi ); + emit newTelexPageSet( i_page ); + } + } + } + else + emit teletextPossible( b_enabled ); } -void InputManager::telexSetTransparency() +void InputManager::activateTeletext( bool b_enable ) { if( hasInput() ) { - vlc_object_t *p_vbi; - p_vbi = (vlc_object_t *) vlc_object_find_name( p_input, - "zvbi", FIND_ANYWHERE ); - if( p_vbi ) + const int i_teletext_es = var_GetInteger( p_input, "teletext-es" ); + if( i_teletext_es >= 0 ) { - var_SetBool( p_vbi, "vbi-opaque", b_transparentTelextext ); - b_transparentTelextext = !b_transparentTelextext; - vlc_object_release( p_vbi ); + var_SetInteger( p_input, "spu-es", b_enable ? i_teletext_es : -1 ); } } - emit toggleTelexTransparency(); } void InputManager::slower() @@ -490,6 +596,36 @@ void InputManager::setRate( int new_rate ) 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. @@ -503,16 +639,12 @@ MainInputManager::MainInputManager( intf_thread_t *_p_intf ) 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_AddCallback( p_intf->p_libvlc, "volume-change", VolumeChanged, this ); - // No necessary, I think TODO REMOVE ME at the end - //var_AddCallback( THEPL, "intf-change", ItemChanged, im ); - /* Warn our embedded IM about input changes */ CONNECT( this, inputChanged( input_thread_t * ), im, setInput( input_thread_t * ) ); @@ -538,7 +670,6 @@ MainInputManager::~MainInputManager() 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 ); } @@ -557,7 +688,7 @@ void MainInputManager::customEvent( QEvent *event ) } /* 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) ) ) @@ -572,26 +703,26 @@ void MainInputManager::customEvent( QEvent *event ) if( !p_input ) { - QPL_LOCK; - p_input = THEPL->p_input; - if( p_input && !( !vlc_object_alive (p_input) || p_input->b_dead) ) + p_input = playlist_CurrentInput(THEPL); + if( p_input ) { - vlc_object_yield( p_input ); var_AddCallback( p_input, "state", PLItemChanged, this ); emit inputChanged( p_input ); } - else - p_input = NULL; - QPL_UNLOCK; } vlc_mutex_unlock( &p_intf->change_lock ); } else { /* we are working as a dialogs provider */ - playlist_t *p_playlist = pl_Yield( p_intf ); - p_input = p_playlist->p_input; - emit inputChanged( p_input ); + 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 ); } } @@ -613,32 +744,11 @@ void MainInputManager::prev() 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() ) - { - vlc_value_t val; - vlc_object_t *p_vbi; - p_vbi = (vlc_object_t *) vlc_object_find_name( getInput(), - "zvbi", FIND_ANYWHERE ); - if( p_vbi ) - { - vlc_object_release( p_vbi ); - return true; - } - var_Change( getInput(), "spu-es", VLC_VAR_CHOICESCOUNT, &val, NULL ); - return (val.i_int > 0); - } - return false; + else + getIM()->togglePlayPause(); } /* Static callbacks */ @@ -647,17 +757,39 @@ bool MainInputManager::teletextState() static int InterfaceChanged( vlc_object_t *p_this, const char *psz_var, vlc_value_t oldval, vlc_value_t newval, void *param ) { + /* 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(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(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 ) +{ + InputManager *im = (InputManager*)param; + + IMEvent *event = new IMEvent( InterfaceVoutUpdate_Type, 0 ); + QApplication::postEvent( im, static_cast(event) ); + return VLC_SUCCESS; +} + static int ItemStateChanged( vlc_object_t *p_this, const char *psz_var, vlc_value_t oldval, vlc_value_t newval, void *param ) { @@ -705,7 +837,16 @@ static int ChangeSPU( vlc_object_t *p_this, const char *var, vlc_value_t o, IMEvent *event = new IMEvent( ItemSpuChanged_Type, 0 ); QApplication::postEvent( im, static_cast(event) ); return VLC_SUCCESS; +} + +static int ChangeTeletext( vlc_object_t *p_this, const char *var, vlc_value_t o, + vlc_value_t n, void *param ) +{ + InputManager *im = (InputManager*)param; + IMEvent *event = new IMEvent( ItemTeletextChanged_Type, 0 ); + QApplication::postEvent( im, static_cast(event) ); + return VLC_SUCCESS; } /* MIM */