X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Finput_manager.cpp;h=78b799bfd18dbfaa7c6c4e92217758e19b44e439;hb=e3c8503697329380e68f9373c5fff99c2492c1a0;hp=c1dd61a7162d94cca425426adfebd3e7ab2736df;hpb=aa59948dfe8d25bf9fe378c45e2c0dd3276aaec6;p=vlc diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp index c1dd61a716..78b799bfd1 100644 --- a/modules/gui/qt4/input_manager.cpp +++ b/modules/gui/qt4/input_manager.cpp @@ -1,10 +1,12 @@ /***************************************************************************** * input_manager.cpp : Manage an input and interact with its GUI elements **************************************************************************** - * Copyright (C) 2006 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 @@ -20,8 +22,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ - -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include "qt4.hpp" #include "input_manager.hpp" @@ -31,139 +34,321 @@ 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 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 ItemStateChanged( vlc_object_t *, const char *, + vlc_value_t, vlc_value_t, void * ); +static int ItemRateChanged( vlc_object_t *, const char *, + vlc_value_t, vlc_value_t, void * ); +static int ItemTitleChanged( 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 * ); /********************************************************************** * 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; - p_input = NULL; - ON_TIMEOUT( update() ); + 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(); } +/* 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; - emit positionUpdated( 0.0,0,0 ); 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_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; - var_AddCallback( p_input, "audio-es", ChangeAudio, this ); - var_AddCallback( p_input, "video-es", ChangeVideo, this ); + 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 ); } - } + +/* delete Input if it ever existed. + Delete the callbacls on input + p_input is released once here */ void InputManager::delInput() { if( p_input ) { - var_DelCallback( p_input, "audio-es", ChangeAudio, this ); - var_DelCallback( p_input, "video-es", ChangeVideo, this ); + delCallbacks(); + vlc_object_release( p_input ); + i_old_playing_status = END_S; + + i_input_id = 0; + old_name=qfu(""); + artUrl = qfu(""); + emit positionUpdated( 0.0, 0 ,0 ); + emit statusChanged( END_S ); + emit nameChanged( "" ); + emit artChanged( "" ); + p_input = NULL; } } -void InputManager::update() +/* Add the callbacks on Input. Self explanatory */ +void InputManager::addCallbacks() { - /// \todo Emit the signals only if it changed - if( !p_input ) return; + /* We don't care about: + - spu-es + - chapter + - programs + - audio-delay + - spu-delay + - bookmark + - position, time, length, because they are included in intf-change + */ + /* 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/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 ); +} + +/* 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, "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 ); +} + +/* Convert the event from the callbacks in actions */ +void InputManager::customEvent( QEvent *event ) +{ + int type = event->type(); + IMEvent *ple = static_cast(event); + + if ( type != PositionUpdate_Type && + type != ItemChanged_Type && + type != ItemRateChanged_Type && + type != ItemTitleChanged_Type && + type != ItemStateChanged_Type ) + return; + + if( !hasInput() ) return; + + if( ( type != PositionUpdate_Type && type != ItemRateChanged_Type ) && + ( i_input_id != ple->i_id ) ) + return; - if( p_input->b_dead || p_input->b_die ) + if( type != PositionUpdate_Type ) + msg_Dbg( p_intf, "New Event: type %i", type ); + + /* Actions */ + switch( type ) { - emit positionUpdated( 0.0, 0, 0 ); - emit navigationChanged( 0 ); - emit statusChanged( 0 ); // 0 = STOPPED, 1 = PLAY, 2 = PAUSE + case PositionUpdate_Type: + UpdatePosition(); + break; + case ItemChanged_Type: + UpdateMeta(); + UpdateNavigation(); + UpdateTracks(); + UpdateStatus(); + UpdateArt(); + break; + case ItemRateChanged_Type: + UpdateRate(); + break; + case ItemTitleChanged_Type: + UpdateNavigation(); + UpdateMeta(); + break; + case ItemStateChanged_Type: + UpdateTracks(); + UpdateStatus(); + break; } +} - if( !b_had_audio && b_has_audio ) - emit audioStarted(); - if( !b_had_video && b_has_video ) - emit videoStarted(); - +void InputManager::UpdatePosition() +{ /* Update position */ - mtime_t i_length, i_time; + 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" ); + 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 disc status */ - vlc_value_t val; +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 ) { - vlc_value_t val; + val.i_int = 0; var_Change( p_input, "chapter", VLC_VAR_CHOICESCOUNT, &val, NULL ); - if( val.i_int > 0 ) - { - emit navigationChanged( 1 ); // 1 = chapter, 2 = title, 0 = NO - } - else - emit navigationChanged( 2 ); + 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 text */ +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 ); + } +} + +void InputManager::UpdateMeta() +{ + /* Update text, name and nowplaying */ QString text; - if( input_GetItem(p_input)->p_meta && - input_GetItem(p_input)->p_meta->psz_nowplaying && - *input_GetItem(p_input)->p_meta->psz_nowplaying ) + + char *psz_name = input_item_GetTitle( input_GetItem( p_input ) ); + if( EMPTY_STR( psz_name ) ) { - text.sprintf( "%s - %s", - input_GetItem(p_input)->p_meta->psz_nowplaying, - input_GetItem(p_input)->psz_name ); + free( psz_name ); + psz_name = input_item_GetName( input_GetItem( p_input ) ); + } + + char *psz_nowplaying = + input_item_GetNowPlaying( input_GetItem( p_input ) ); + if( !EMPTY_STR( psz_nowplaying ) ) + { + text.sprintf( "%s - %s", psz_nowplaying, psz_name ); } else { - text.sprintf( "%s", input_GetItem(p_input)->psz_name ); + 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 ); } - emit nameChanged( text ); + free( psz_name ); + free( psz_nowplaying ); - /* Update playing status */ - var_Get( p_input, "state", &val ); - val.i_int = val.i_int == PAUSE_S ? PAUSE_S : PLAYING_S; - if( i_old_playing_status != val.i_int ) + if( old_name != text ) { - i_old_playing_status = val.i_int; - emit statusChanged( val.i_int == PAUSE_S ? PAUSE_S : PLAYING_S ); + 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 ); + b_has_audio = val.i_int > 0; + 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*/ + emit teletextEnabled( true );/* FIXME */ +#endif +} + +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 ) ); + } +} + +/* User update of the slider */ void InputManager::sliderUpdate( float new_pos ) { if( hasInput() ) var_SetFloat( p_input, "position", new_pos ); } +/* User togglePlayPause */ void InputManager::togglePlayPause() { vlc_value_t state; var_Get( p_input, "state", &state ); - if( state.i_int != PAUSE_S ) - { - /* A stream is being played, pause it */ - state.i_int = PAUSE_S; - } - else - { - /* Stream is paused, resume it */ - state.i_int = PLAYING_S; - } + state.i_int = ( state.i_int != PLAYING_S ) ? PLAYING_S : PAUSE_S; var_Set( p_input, "state", state ); emit statusChanged( state.i_int ); } @@ -172,7 +357,7 @@ void InputManager::sectionPrev() { if( hasInput() ) { - int i_type = var_Type( p_input, "prev-chapter" ); + int i_type = var_Type( p_input, "next-chapter" ); vlc_value_t val; val.b_bool = VLC_TRUE; var_Set( p_input, (i_type & VLC_VAR_TYPE) != 0 ? "prev-chapter":"prev-title", val ); @@ -183,7 +368,7 @@ void InputManager::sectionNext() { if( hasInput() ) { - int i_type = var_Type( p_input, "prev-chapter" ); + int i_type = var_Type( p_input, "next-chapter" ); vlc_value_t val; val.b_bool = VLC_TRUE; var_Set( p_input, (i_type & VLC_VAR_TYPE) != 0 ? "next-chapter":"next-title", val ); @@ -193,9 +378,48 @@ void InputManager::sectionNext() void InputManager::sectionMenu() { if( hasInput() ) - var_SetInteger( p_input, "title 0", 2); + var_SetInteger( p_input, "title 0", 2 ); +} + +#ifdef ZVBI_COMPILED +void InputManager::telexGotoPage( 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 ) + { + var_SetInteger( p_vbi, "vbi-page", page ); + vlc_object_release( p_vbi ); + } + } } +void InputManager::telexToggle( bool b_enabled ) +{ + int i_page = b_enabled ? 100 : 0 ; + + telexGotoPage( i_page ); +} + +void InputManager::telexSetTransparency( bool b_transp ) +{ + if( hasInput() ) + { + vlc_object_t *p_vbi; + p_vbi = (vlc_object_t *) vlc_object_find_name( p_input, + "zvbi", FIND_ANYWHERE ); + if( p_vbi ) + { + var_SetBool( p_input->p_libvlc, "vbi-opaque", b_transp ); + vlc_object_release( p_vbi ); + } + } +} +#endif + void InputManager::slower() { if( hasInput() ) @@ -214,51 +438,128 @@ void InputManager::normalRate() var_SetInteger( p_input, "rate", INPUT_RATE_DEFAULT ); } +void InputManager::setRate( int new_rate ) +{ + if( hasInput() ) + var_SetInteger( p_input, "rate", 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 ); - ON_TIMEOUT( updateInput() ); + +// 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 * ) ); + im, setInput( input_thread_t * ) ); } MainInputManager::~MainInputManager() { - if( p_input ) vlc_object_release( p_input ); + 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, "activity", PLItemChanged, this ); + var_DelCallback( THEPL, "item-change", ItemChanged, im ); +// var_DelCallback( THEPL, "item-change", PLItemChanged, this ); + + var_DelCallback( THEPL, "playlist-current", PLItemChanged, this ); } -void MainInputManager::updateInput() +void MainInputManager::customEvent( QEvent *event ) { - vlc_mutex_lock( &p_intf->change_lock ); - if( p_input && p_input->b_dead ) + int type = event->type(); + if ( type != ItemChanged_Type && type != VolumeChanged_Type ) + return; + + // msg_Dbg( p_intf, "New MainIM Event of type: %i", type ); + if( type == VolumeChanged_Type ) { - vlc_object_release( p_input ); - getIM()->delInput(); - p_input = NULL; - emit inputChanged( NULL ); + emit volumeChanged(); + return; } - if( !p_input ) + /* Should be PLItemChanged Event */ + if( VLC_OBJECT_INTF == p_intf->i_object_type ) { - QPL_LOCK; - p_input = THEPL->p_input; - if( p_input ) + vlc_mutex_lock( &p_intf->change_lock ); + if( p_input && ( p_input->b_dead || p_input->b_die ) ) { - vlc_object_yield( p_input ); + 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 ) + { + QPL_LOCK; + 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 + p_input = NULL; + QPL_UNLOCK; + } + vlc_mutex_unlock( &p_intf->change_lock ); + } + 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; emit inputChanged( p_input ); } - QPL_UNLOCK; } - vlc_mutex_unlock( &p_intf->change_lock ); +} + +/* Playlist Control functions */ +void MainInputManager::stop() +{ + playlist_Stop( THEPL ); +} + +void MainInputManager::next() +{ + playlist_Next( THEPL ); +} + +void MainInputManager::prev() +{ + playlist_Prev( THEPL ); } void MainInputManager::togglePlayPause() @@ -271,13 +572,70 @@ void MainInputManager::togglePlayPause() getIM()->togglePlayPause(); } +/* Static callbacks */ + +/* IM */ +static int InterfaceChanged( vlc_object_t *p_this, const char *psz_var, + vlc_value_t oldval, vlc_value_t newval, void *param ) +{ + static int counter = 0; + InputManager *im = (InputManager*)param; + + counter = counter++ % 4; + if(!counter) + return VLC_SUCCESS; + IMEvent *event = new IMEvent( PositionUpdate_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 ) +{ + InputManager *im = (InputManager*)param; + + IMEvent *event = new IMEvent( ItemStateChanged_Type, 0 ); + QApplication::postEvent( im, static_cast(event) ); + return VLC_SUCCESS; +} + +static int ItemRateChanged( 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( ItemRateChanged_Type, 0 ); + QApplication::postEvent( im, static_cast(event) ); + return VLC_SUCCESS; +} + +static int ItemTitleChanged( 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( ItemTitleChanged_Type, 0 ); + QApplication::postEvent( im, static_cast(event) ); + return VLC_SUCCESS; +} + +static int ItemChanged( 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( ItemChanged_Type, newval.i_int ); + QApplication::postEvent( im, static_cast(event) ); + return VLC_SUCCESS; +} + static int ChangeAudio( 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; - return 0; + return VLC_SUCCESS; } static int ChangeVideo( vlc_object_t *p_this, const char *var, vlc_value_t o, @@ -285,5 +643,27 @@ static int ChangeVideo( vlc_object_t *p_this, const char *var, vlc_value_t o, { InputManager *im = (InputManager*)param; im->b_has_video = true; - return 0; + 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 *mim = (MainInputManager*)param; + + IMEvent *event = new IMEvent( ItemChanged_Type, newval.i_int ); + 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 *mim = (MainInputManager*)param; + + IMEvent *event = new IMEvent( VolumeChanged_Type, newval.i_int ); + QApplication::postEvent( mim, static_cast(event) ); + return VLC_SUCCESS; +} +