X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fgui%2Fqt4%2Finput_manager.cpp;h=936aeb92b48d9083d28ae3e243830909cf9f15b9;hb=f7bb9fcf168e22df7ac7a056ec989ce8ef41ffb4;hp=84b26a6c82e4d16595eb64fab83603cb760e6d87;hpb=70304d686b939feedc4505b91b5cc85a2e664364;p=vlc diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp index 84b26a6c82..936aeb92b4 100644 --- a/modules/gui/qt4/input_manager.cpp +++ b/modules/gui/qt4/input_manager.cpp @@ -1,11 +1,12 @@ /***************************************************************************** * input_manager.cpp : Manage an input and interact with its GUI elements **************************************************************************** - * Copyright (C) 2006-2007 the VideoLAN team + * Copyright (C) 2006-2008 the VideoLAN team * $Id$ * * Authors: Clément Stenac * Ilkka Ollakka + * Jean-Baptiste * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,10 +30,8 @@ #include "input_manager.hpp" #include "dialogs_provider.hpp" -static int ChangeVideo( vlc_object_t *p_this, const char *var, vlc_value_t o, - vlc_value_t n, void *param ); -static int ChangeAudio( vlc_object_t *p_this, const char *var, vlc_value_t o, - vlc_value_t n, void *param ); +static int ChangeSPU( 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 *, @@ -50,15 +49,21 @@ static int VolumeChanged( vlc_object_t *, const char *, /********************************************************************** * InputManager implementation + ********************************************************************** + * The Input Manager can be the main one around the playlist + * But can also be used for VLM dialog or similar **********************************************************************/ InputManager::InputManager( QObject *parent, intf_thread_t *_p_intf) : QObject( parent ), p_intf( _p_intf ) { i_old_playing_status = END_S; - old_name = ""; - p_input = NULL; - i_rate = 0; + old_name = ""; + artUrl = ""; + p_input = NULL; + i_rate = 0; + i_input_id = 0; + b_transparentTelextext = false; } InputManager::~InputManager() @@ -66,46 +71,60 @@ InputManager::~InputManager() delInput(); } +/* Define the Input used. + Add the callbacks on input + p_input is yield once here */ void InputManager::setInput( input_thread_t *_p_input ) { 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 ); - vlc_value_t val; - var_Change( p_input, "video-es", VLC_VAR_CHOICESCOUNT, &val, NULL ); - b_has_video = val.i_int > 0; - var_Change( p_input, "audio-es", VLC_VAR_CHOICESCOUNT, &val, NULL ); - b_has_audio = val.i_int > 0; emit statusChanged( PLAYING_S ); + UpdateMeta(); + UpdateArt(); + UpdateSPU(); + UpdateNavigation(); addCallbacks(); + i_input_id = input_GetItem( p_input )->i_id; + } + else + { + p_input = NULL; + i_input_id = 0; + emit rateChanged( INPUT_RATE_DEFAULT ); + emit inputUnset(); } } +/* delete Input if it ever existed. + Delete the callbacls on input + p_input is released once here */ void InputManager::delInput() { 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; + UpdateSPU(); } } +/* Add the callbacks on Input. Self explanatory */ void InputManager::addCallbacks() { /* We don't care about: - - spu-es - chapter - programs - audio-delay @@ -115,43 +134,54 @@ void InputManager::addCallbacks() */ /* src/input/input.c:1629 */ var_AddCallback( p_input, "state", ItemStateChanged, this ); - /* src/input/es-out.c:550 */ - var_AddCallback( p_input, "audio-es", ChangeAudio, this ); - /* src/input/es-out.c:551 */ - var_AddCallback( p_input, "video-es", ChangeVideo, this ); + /* src/input/es-out.c:552 */ + var_AddCallback( p_input, "spu-es", ChangeSPU, 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_AddCallback( p_input, "intf-change", InterfaceChanged, this ); } +/* Delete the callbacks on Input. Self explanatory */ void InputManager::delCallbacks() { - var_DelCallback( p_input, "audio-es", ChangeAudio, this ); - var_DelCallback( p_input, "video-es", ChangeVideo, this ); + var_DelCallback( p_input, "spu-es", ChangeSPU, 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 ); } +/* Convert the event from the callbacks in actions */ void InputManager::customEvent( QEvent *event ) { int type = event->type(); - if ( type != PositionUpdate_Type && type != ItemChanged_Type && - type != ItemRateChanged_Type && type != ItemTitleChanged_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 ) 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 != ItemSpuChanged_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 ) { case PositionUpdate_Type: @@ -159,74 +189,80 @@ void InputManager::customEvent( QEvent *event ) break; case ItemChanged_Type: UpdateMeta(); - UpdateTitle(); + UpdateStatus(); + UpdateArt(); + break; + case ItemStateChanged_Type: + UpdateStatus(); + UpdateNavigation(); + UpdateMeta(); + break; + case ItemTitleChanged_Type: + UpdateNavigation(); + UpdateMeta(); break; case ItemRateChanged_Type: UpdateRate(); break; - case ItemTitleChanged_Type: - UpdateTitle(); + case ItemSpuChanged_Type: + UpdateSPU(); break; - case ItemStateChanged_Type: - UpdateStatus(); - break; } } -void InputManager::UpdatePosition( void ) +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 ) +void InputManager::UpdateNavigation() { - /* Update navigation status */ - vlc_value_t val; val.i_int = 0; - var_Change( p_input, "title", VLC_VAR_CHOICESCOUNT, &val, NULL ); - msg_Dbg( p_intf, "updateTitle called" ); - 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( void ) +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( void ) +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( void ) +void InputManager::UpdateMeta() { /* Update text, name and nowplaying */ QString text; @@ -265,7 +301,47 @@ void InputManager::UpdateMeta( void ) emit nameChanged( text ); old_name=text; } +} + +bool InputManager::hasAudio() +{ + if( hasInput() ) + { + vlc_value_t val; + var_Change( p_input, "audio-es", VLC_VAR_CHOICESCOUNT, &val, NULL ); + return val.i_int > 0; + } + return false; +} + +bool InputManager::hasVideo() +{ + if( hasInput() ) + { + vlc_value_t val; + var_Change( p_input, "video-es", VLC_VAR_CHOICESCOUNT, &val, NULL ); + return val.i_int > 0; + } + return false; + +} + +void InputManager::UpdateSPU() +{ + if( hasInput() ) + { + vlc_value_t val; + var_Change( p_input, "spu-es", VLC_VAR_CHOICESCOUNT, &val, NULL ); + telexToggle( val.i_int > 0 ); + } + else + { + telexToggle( false ); + } +} +void InputManager::UpdateArt() +{ /* Update Art meta */ QString url; char *psz_art = input_item_GetArtURL( input_GetItem( p_input ) ); @@ -274,14 +350,11 @@ void InputManager::UpdateMeta( void ) 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 ) ); } - - /* Update ZVBI status */ -#ifdef ZVBI_COMPILED - /* Update teletext status*/ - emit teletextEnabled( true );/* FIXME */ -#endif } /* User update of the slider */ @@ -291,6 +364,7 @@ void InputManager::sliderUpdate( float new_pos ) var_SetFloat( p_input, "position", new_pos ); } +/* User togglePlayPause */ void InputManager::togglePlayPause() { vlc_value_t state; @@ -305,7 +379,7 @@ void InputManager::sectionPrev() if( hasInput() ) { int i_type = var_Type( p_input, "next-chapter" ); - vlc_value_t val; val.b_bool = VLC_TRUE; + vlc_value_t val; val.b_bool = true; var_Set( p_input, (i_type & VLC_VAR_TYPE) != 0 ? "prev-chapter":"prev-title", val ); } @@ -316,7 +390,7 @@ void InputManager::sectionNext() if( hasInput() ) { int i_type = var_Type( p_input, "next-chapter" ); - vlc_value_t val; val.b_bool = VLC_TRUE; + vlc_value_t val; val.b_bool = true; var_Set( p_input, (i_type & VLC_VAR_TYPE) != 0 ? "next-chapter":"next-title", val ); } @@ -325,10 +399,12 @@ void InputManager::sectionNext() void InputManager::sectionMenu() { if( hasInput() ) - var_SetInteger( p_input, "title 0", 2 ); + { + vlc_value_t val; val.i_int = 2; + var_Set( p_input, "title 0", val ); + } } -#ifdef ZVBI_COMPILED void InputManager::telexGotoPage( int page ) { if( hasInput() ) @@ -342,18 +418,38 @@ void InputManager::telexGotoPage( int page ) vlc_object_release( p_vbi ); } } + emit setNewTelexPage( page ); } void InputManager::telexToggle( bool b_enabled ) { - int i_page = 0; + 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, + "zvbi", FIND_ANYWHERE ); + if( p_vbi ) + { + i_page = var_GetInteger( p_vbi, "vbi-page" ); + vlc_object_release( p_vbi ); + i_page = b_enabled ? i_page : 0; + telexGotoPage( i_page ); + } + } + emit teletextEnabled( b_enabled ); +} - if( b_enabled ) - i_page = 100; - telexGotoPage( i_page ); +void InputManager::telexToggleButtons() +{ + emit toggleTelexButtons(); } -void InputManager::telexSetTransparency( bool b_transp ) +void InputManager::telexSetTransparency() { if( hasInput() ) { @@ -362,12 +458,13 @@ void InputManager::telexSetTransparency( bool b_transp ) "zvbi", FIND_ANYWHERE ); if( p_vbi ) { - var_SetBool( p_input->p_libvlc, "vbi-opaque", b_transp ); + var_SetBool( p_vbi, "vbi-opaque", b_transparentTelextext ); + b_transparentTelextext = !b_transparentTelextext; vlc_object_release( p_vbi ); } } + emit toggleTelexTransparency(); } -#endif void InputManager::slower() { @@ -395,68 +492,82 @@ void InputManager::setRate( int new_rate ) /********************************************************************** * MainInputManager implementation. Wrap an input manager and - * take care of updating the main playlist input + * take care of updating the main playlist input. + * Used in the main playlist Dialog **********************************************************************/ MainInputManager * MainInputManager::instance = NULL; -MainInputManager::MainInputManager( intf_thread_t *_p_intf ) : QObject(NULL), - p_intf( _p_intf ) +MainInputManager::MainInputManager( intf_thread_t *_p_intf ) + : QObject(NULL), p_intf( _p_intf ) { p_input = NULL; im = new InputManager( this, p_intf ); - //var_AddCallback( THEPL, "intf-change", ItemChanged, im ); - //var_AddCallback( THEPL, "playlist-current", ItemChanged, im ); - - 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( 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 * ) ); + + /* 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(event) ); + } MainInputManager::~MainInputManager() { 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, "intf-change", ItemChanged, this ); + var_DelCallback( THEPL, "playlist-current", PLItemChanged, this ); } void MainInputManager::customEvent( QEvent *event ) { int type = event->type(); - msg_Dbg( p_intf, "New MIM Event, 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(); return; } - /* Should be PLItemChanged */ - if( VLC_OBJECT_INTF == p_intf->i_object_type ) + /* Should be PLItemChanged Event */ + if( VLC_OBJECT_INTF == p_intf->i_object_type ) /* FIXME: don't use object type */ { 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 ) @@ -465,7 +576,8 @@ void MainInputManager::customEvent( QEvent *event ) p_input = THEPL->p_input; if( p_input && !( p_input->b_die || p_input->b_dead) ) { - im->setInput( p_input ); + vlc_object_yield( p_input ); + var_AddCallback( p_input, "state", PLItemChanged, this ); emit inputChanged( p_input ); } else @@ -477,17 +589,13 @@ void MainInputManager::customEvent( QEvent *event ) else { /* we are working as a dialogs provider */ - playlist_t *p_playlist = (playlist_t *) vlc_object_find( p_intf, - VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); - if( p_playlist ) - { - p_input = p_playlist->p_input; - vlc_object_yield( p_input ); - emit inputChanged( p_input ); - } + playlist_t *p_playlist = pl_Yield( p_intf ); + p_input = p_playlist->p_input; + emit inputChanged( p_input ); } } +/* Playlist Control functions */ void MainInputManager::stop() { playlist_Stop( THEPL ); @@ -513,6 +621,26 @@ void MainInputManager::togglePlayPause() 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; +} + /* Static callbacks */ /* IM */ @@ -522,7 +650,7 @@ static int InterfaceChanged( vlc_object_t *p_this, const char *psz_var, 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 ); @@ -531,7 +659,7 @@ static int InterfaceChanged( vlc_object_t *p_this, const char *psz_var, } 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; @@ -541,7 +669,7 @@ static int ItemStateChanged( vlc_object_t *p_this, const char *psz_var, } 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; @@ -551,7 +679,7 @@ static int ItemRateChanged( vlc_object_t *p_this, const char *psz_var, } 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; @@ -570,41 +698,34 @@ static int ItemChanged( vlc_object_t *p_this, const char *psz_var, return VLC_SUCCESS; } - -static int ChangeAudio( vlc_object_t *p_this, const char *var, vlc_value_t o, +static int ChangeSPU( vlc_object_t *p_this, const char *var, vlc_value_t o, vlc_value_t n, void *param ) { InputManager *im = (InputManager*)param; - im->b_has_audio = true; + IMEvent *event = new IMEvent( ItemSpuChanged_Type, 0 ); + QApplication::postEvent( im, static_cast(event) ); return VLC_SUCCESS; -} -static int ChangeVideo( vlc_object_t *p_this, const char *var, vlc_value_t o, - vlc_value_t n, void *param ) -{ - InputManager *im = (InputManager*)param; - im->b_has_video = true; - return VLC_SUCCESS; } /* MIM */ static int PLItemChanged( vlc_object_t *p_this, const char *psz_var, vlc_value_t oldval, vlc_value_t newval, void *param ) { - MainInputManager *im = (MainInputManager*)param; + MainInputManager *mim = (MainInputManager*)param; IMEvent *event = new IMEvent( ItemChanged_Type, newval.i_int ); - QApplication::postEvent( im, static_cast(event) ); + QApplication::postEvent( mim, static_cast(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 ) { - MainInputManager *im = (MainInputManager*)param; + MainInputManager *mim = (MainInputManager*)param; IMEvent *event = new IMEvent( VolumeChanged_Type, newval.i_int ); - QApplication::postEvent( im, static_cast(event) ); + QApplication::postEvent( mim, static_cast(event) ); return VLC_SUCCESS; }