*****************************************************************************/
#define __STDC_FORMAT_MACROS 1
+#define __STDC_CONSTANT_MACROS 1
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include "input_manager.hpp"
-#include <vlc_keys.h>
-#include <vlc_url.h>
+#include "recents.hpp"
+
+#include <vlc_keys.h> /* ACTION_ID */
+#include <vlc_url.h> /* decode_URI */
+#include <vlc_strings.h> /* str_format_meta */
+#include <vlc_aout.h> /* audio_output_t */
#include <QApplication>
+#include <QFile>
+#include <QDir>
+#include <QSignalMapper>
+#include <QMessageBox>
#include <assert.h>
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 * );
+/* Ensure arbitratry (not dynamically allocated) event IDs are not in use */
+static inline void registerAndCheckEventIds( int start, int end )
+{
+ for ( int i=start ; i<=end ; i++ )
+ Q_ASSERT( QEvent::registerEventType( i ) == i ); /* event ID collision ! */
+}
/**********************************************************************
* InputManager implementation
timeA = 0;
timeB = 0;
f_cache = -1.; /* impossible initial value, different from all */
+ registerAndCheckEventIds( IMEvent::PositionUpdate, IMEvent::FullscreenControlPlanHide );
+ registerAndCheckEventIds( PLEvent::PLItemAppended, PLEvent::PLEmpty );
}
InputManager::~InputManager()
{
delInput();
p_input = _p_input;
- if( p_input && !( p_input->b_dead || !vlc_object_alive (p_input) ) )
+ if( p_input != NULL )
{
msg_Dbg( p_intf, "IM: Setting an input" );
vlc_object_hold( p_input );
addCallbacks();
+
UpdateStatus();
UpdateName();
UpdateArt();
p_item = input_GetItem( p_input );
emit rateChanged( var_GetFloat( p_input, "rate" ) );
+
+ /* Get Saved Time */
+ int i_time = RecentsMRL::getInstance( p_intf )->time( p_item->psz_uri );
+ if( i_time > 0 )
+ {
+ THEMIM->togglePlayPause();
+
+ if( QMessageBox::question( NULL,
+ _("Continue playback?"),
+ _("Do you want to restart the playback where left off?"),
+ QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes )
+ == QMessageBox::Yes )
+ var_SetTime( p_input, "time", (int64_t)i_time * 1000 );
+
+ THEMIM->togglePlayPause();
+ }
}
else
{
- p_input = NULL;
p_item = NULL;
assert( !p_input_vbi );
emit rateChanged( var_InheritFloat( p_intf, "rate" ) );
if( !p_input ) return;
msg_Dbg( p_intf, "IM: Deleting the input" );
+ /* Save time / position */
+ float f_pos = var_GetFloat( p_input , "position" );
+ int64_t i_time = var_GetTime( p_input, "time");
+ int i_length = var_GetTime( p_input , "length" ) / CLOCK_FREQ;
+ if( f_pos < 0.05 || f_pos > 0.95 || i_length < 60) {
+ i_time = -1;
+ }
+ RecentsMRL::getInstance( p_intf )->setTime( p_item->psz_uri, i_time );
+
delCallbacks();
i_old_playing_status = END_S;
p_item = NULL;
emit nameChanged( "" );
emit chapterChanged( 0 );
emit titleChanged( 0 );
- emit statusChanged( END_S );
+ emit playingStatusChanged( END_S );
emit teletextPossible( false );
emit AtoBchanged( false, false );
/* Reset all InfoPanels but stats */
emit artChanged( NULL );
+ emit artChanged( "" );
emit infoChanged( NULL );
emit currentMetaChanged( (input_item_t *)NULL );
int i_type = event->type();
IMEvent *ple = static_cast<IMEvent *>(event);
- if( i_type == ItemChanged_Type )
- UpdateMeta( ple->p_item );
+ if( i_type == IMEvent::ItemChanged )
+ UpdateMeta( ple->item() );
if( !hasInput() )
return;
/* Actions */
switch( i_type )
{
- case PositionUpdate_Type:
+ case IMEvent::PositionUpdate:
UpdatePosition();
break;
- case StatisticsUpdate_Type:
+ case IMEvent::StatisticsUpdate:
UpdateStats();
break;
- case ItemChanged_Type:
+ case IMEvent::ItemChanged:
/* Ignore ItemChanged_Type event that does not apply to our input */
- if( p_item == ple->p_item )
+ if( p_item == ple->item() )
{
UpdateStatus();
// UpdateName();
UpdateArt();
+ UpdateMeta();
/* Update duration of file */
}
break;
- case ItemStateChanged_Type:
- // TODO: Fusion with above state
+ case IMEvent::ItemStateChanged:
UpdateStatus();
- // UpdateName();
- // UpdateNavigation(); This shouldn't be useful now
- // UpdateTeletext(); Same
break;
- case NameChanged_Type:
+ case IMEvent::NameChanged:
UpdateName();
break;
- case MetaChanged_Type:
+ case IMEvent::MetaChanged:
UpdateMeta();
UpdateName(); /* Needed for NowPlaying */
UpdateArt(); /* Art is part of meta in the core */
break;
- case InfoChanged_Type:
+ case IMEvent::InfoChanged:
UpdateInfo();
break;
- case ItemTitleChanged_Type:
+ case IMEvent::ItemTitleChanged:
UpdateNavigation();
UpdateName(); /* Display the name of the Chapter, if exists */
break;
- case ItemRateChanged_Type:
+ case IMEvent::ItemRateChanged:
UpdateRate();
break;
- case ItemEsChanged_Type:
+ case IMEvent::ItemEsChanged:
UpdateTeletext();
// We don't do anything ES related. Why ?
break;
- case ItemTeletextChanged_Type:
+ case IMEvent::ItemTeletextChanged:
UpdateTeletext();
break;
- case InterfaceVoutUpdate_Type:
+ case IMEvent::InterfaceVoutUpdate:
UpdateVout();
break;
- case SynchroChanged_Type:
+ case IMEvent::SynchroChanged:
emit synchroChanged();
break;
- case CachingEvent_Type:
+ case IMEvent::CachingEvent:
UpdateCaching();
break;
- case BookmarksChanged_Type:
+ case IMEvent::BookmarksChanged:
emit bookmarksChanged();
break;
- case InterfaceAoutUpdate_Type:
+ case IMEvent::InterfaceAoutUpdate:
UpdateAout();
break;
- case RecordingEvent_Type:
+ case IMEvent::RecordingEvent:
UpdateRecord();
break;
- case ProgramChanged_Type:
+ case IMEvent::ProgramChanged:
UpdateProgramEvent();
break;
- case EPGEvent_Type:
+ case IMEvent::EPGEvent:
UpdateEPG();
break;
default:
static int ItemChanged( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param )
{
+ VLC_UNUSED( p_this ); VLC_UNUSED( psz_var ); VLC_UNUSED( oldval );
+
InputManager *im = (InputManager*)param;
input_item_t *p_item = static_cast<input_item_t *>(newval.p_address);
- IMEvent *event = new IMEvent( ItemChanged_Type, p_item );
+ IMEvent *event = new IMEvent( IMEvent::ItemChanged, p_item );
QApplication::postEvent( im, event );
return VLC_SUCCESS;
}
static int InputEvent( vlc_object_t *p_this, const char *,
vlc_value_t, vlc_value_t newval, void *param )
{
+ VLC_UNUSED( p_this );
+
InputManager *im = (InputManager*)param;
IMEvent *event;
switch( newval.i_int )
{
case INPUT_EVENT_STATE:
- event = new IMEvent( ItemStateChanged_Type );
+ event = new IMEvent( IMEvent::ItemStateChanged );
break;
case INPUT_EVENT_RATE:
- event = new IMEvent( ItemRateChanged_Type );
+ event = new IMEvent( IMEvent::ItemRateChanged );
break;
case INPUT_EVENT_POSITION:
//case INPUT_EVENT_LENGTH:
- event = new IMEvent( PositionUpdate_Type );
+ event = new IMEvent( IMEvent::PositionUpdate );
break;
case INPUT_EVENT_TITLE:
case INPUT_EVENT_CHAPTER:
- event = new IMEvent( ItemTitleChanged_Type );
+ event = new IMEvent( IMEvent::ItemTitleChanged );
break;
case INPUT_EVENT_ES:
- event = new IMEvent( ItemEsChanged_Type );
+ event = new IMEvent( IMEvent::ItemEsChanged );
break;
case INPUT_EVENT_TELETEXT:
- event = new IMEvent( ItemTeletextChanged_Type );
+ event = new IMEvent( IMEvent::ItemTeletextChanged );
break;
case INPUT_EVENT_STATISTICS:
- event = new IMEvent( StatisticsUpdate_Type );
+ event = new IMEvent( IMEvent::StatisticsUpdate );
break;
case INPUT_EVENT_VOUT:
- event = new IMEvent( InterfaceVoutUpdate_Type );
+ event = new IMEvent( IMEvent::InterfaceVoutUpdate );
break;
case INPUT_EVENT_AOUT:
- event = new IMEvent( InterfaceAoutUpdate_Type );
+ event = new IMEvent( IMEvent::InterfaceAoutUpdate );
break;
case INPUT_EVENT_ITEM_META: /* Codec MetaData + Art */
- event = new IMEvent( MetaChanged_Type );
+ event = new IMEvent( IMEvent::MetaChanged );
break;
case INPUT_EVENT_ITEM_INFO: /* Codec Info */
- event = new IMEvent( InfoChanged_Type );
+ event = new IMEvent( IMEvent::InfoChanged );
break;
case INPUT_EVENT_ITEM_NAME:
- event = new IMEvent( NameChanged_Type );
+ event = new IMEvent( IMEvent::NameChanged );
break;
case INPUT_EVENT_AUDIO_DELAY:
case INPUT_EVENT_SUBTITLE_DELAY:
- event = new IMEvent( SynchroChanged_Type );
+ event = new IMEvent( IMEvent::SynchroChanged );
break;
case INPUT_EVENT_CACHE:
- event = new IMEvent( CachingEvent_Type );
+ event = new IMEvent( IMEvent::CachingEvent );
break;
case INPUT_EVENT_BOOKMARK:
- event = new IMEvent( BookmarksChanged_Type );
+ event = new IMEvent( IMEvent::BookmarksChanged );
break;
case INPUT_EVENT_RECORD:
- event = new IMEvent( RecordingEvent_Type );
+ event = new IMEvent( IMEvent::RecordingEvent );
break;
case INPUT_EVENT_PROGRAM:
/* This is for PID changes */
- event = new IMEvent( ProgramChanged_Type );
+ event = new IMEvent( IMEvent::ProgramChanged );
break;
case INPUT_EVENT_ITEM_EPG:
/* EPG data changed */
- event = new IMEvent( EPGEvent_Type );
+ event = new IMEvent( IMEvent::EPGEvent );
break;
case INPUT_EVENT_SIGNAL:
vlc_value_t, vlc_value_t, void *param )
{
InputManager *im = (InputManager*)param;
- IMEvent *event = new IMEvent( ItemTeletextChanged_Type );
+ IMEvent *event = new IMEvent( IMEvent::ItemTeletextChanged );
QApplication::postEvent( im, event );
return VLC_SUCCESS;
int i_length;
int64_t i_time;
float f_pos;
- i_length = var_GetTime( p_input , "length" ) / 1000000;
+ i_length = var_GetTime( p_input , "length" ) / CLOCK_FREQ;
i_time = var_GetTime( p_input , "time");
f_pos = var_GetFloat( p_input , "position" );
emit positionUpdated( f_pos, i_time, i_length );
if( val.i_int > 0 )
{
- emit titleChanged( true );
- msg_Dbg( p_intf, "Title %"PRId64, val.i_int );
/* p_input != NULL since val.i_int != 0 */
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 );
+
+ emit titleChanged( val.i_int > 1 );
+ emit chapterChanged( val2.i_int > 1 );
}
else
- emit titleChanged( false );
+ emit chapterChanged( false );
+
+ if( hasInput() )
+ emit inputCanSeek( var_GetBool( p_input, "can-seek" ) );
+ else
+ emit inputCanSeek( false );
}
void InputManager::UpdateStatus()
if( i_old_playing_status != state )
{
i_old_playing_status = state;
- emit statusChanged( state );
+ emit playingStatusChanged( state );
}
}
void InputManager::UpdateName()
{
- /* Update text, name and nowplaying */
- QString text;
+ assert( p_input );
- /* Try to get the Title, then the Name */
- char *psz_name = input_item_GetTitleFbName( input_GetItem( p_input ) );
+ /* Update text, name and nowplaying */
+ QString name;
/* 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 /* 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 );
+ char *format = var_InheritString( p_intf, "input-title-format" );
+ char *formated = str_format_meta( p_input, format );
+ free( format );
+ name = qfu(formated);
+ free( formated );
/* If we have Nothing */
- if( text.isEmpty() )
+ if( name.simplified().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 );
+ char *uri = input_item_GetURI( input_GetItem( p_input ) );
+ char *file = uri ? strrchr( uri, '/' ) : NULL;
+ if( file != NULL )
+ {
+ decode_URI( ++file );
+ name = qfu(file);
+ }
+ else
+ name = qfu(uri);
+ free( uri );
}
- if( oldName != text )
+ name = name.trimmed();
+
+ if( oldName != name )
{
- emit nameChanged( text );
- oldName = text;
+ emit nameChanged( name );
+ oldName = name;
}
}
+int InputManager::playingStatus()
+{
+ return i_old_playing_status;
+}
+
bool InputManager::hasAudio()
{
if( hasInput() )
return false;
}
+bool InputManager::hasVisualisation()
+{
+ if( !p_input )
+ return false;
+
+ audio_output_t *aout = input_GetAout( p_input );
+ if( !aout )
+ return false;
+
+ char *visual = var_InheritString( aout, "visual" );
+ vlc_object_release( aout );
+
+ if( !visual )
+ return false;
+
+ free( visual );
+ return true;
+}
+
void InputManager::UpdateTeletext()
{
if( hasInput() )
emit voutChanged( b_video );
/* Release the vout list */
- for( int i = 0; i < i_vout; i++ )
+ for( size_t i = 0; i < i_vout; i++ )
vlc_object_release( (vlc_object_t*)pp_vout[i] );
free( pp_vout );
}
}
}
-void InputManager::requestArtUpdate()
+void InputManager::requestArtUpdate( input_item_t *p_item, bool b_forced )
{
- if( hasInput() )
- {
- playlist_AskForArtEnqueue( pl_Get(p_intf), input_GetItem( p_input ) );
+ bool b_current_item = false;
+ if ( !p_item && hasInput() )
+ { /* default to current item */
+ p_item = input_GetItem( p_input );
+ b_current_item = true;
}
- else
+
+ if ( p_item )
{
+ /* check if it has already been enqueued */
+ if ( p_item->p_meta && !b_forced )
+ {
+ int status = vlc_meta_GetStatus( p_item->p_meta );
+ if ( status & ( ITEM_ART_NOTFOUND|ITEM_ART_FETCHED ) )
+ return;
+ }
+ libvlc_ArtRequest( p_intf->p_libvlc, p_item,
+ (b_forced) ? META_REQUEST_OPTION_SCOPE_ANY
+ : META_REQUEST_OPTION_NONE );
/* No input will signal the cover art to update,
- * let's do it ourself */
- UpdateArt();
+ * let's do it ourself */
+ if ( b_current_item )
+ UpdateArt();
+ else
+ emit artChanged( p_item );
}
}
emit artChanged( artUrl );
}
+void InputManager::setArt( input_item_t *p_item, QString fileUrl )
+{
+ if( hasInput() )
+ {
+ char *psz_cachedir = config_GetUserDir( VLC_CACHE_DIR );
+ QString old_url = THEMIM->getIM()->decodeArtURL( p_item );
+ old_url = QDir( old_url ).canonicalPath();
+
+ if( old_url.startsWith( QString::fromUtf8( psz_cachedir ) ) )
+ QFile( old_url ).remove(); /* Purge cached artwork */
+
+ free( psz_cachedir );
+
+ input_item_SetArtURL( p_item , fileUrl.toUtf8().constData() );
+ UpdateArt();
+ }
+}
+
inline void InputManager::UpdateStats()
{
+ assert( p_input );
emit statisticsUpdated( input_GetItem( p_input ) );
}
-inline void InputManager::UpdateMeta( input_item_t *p_item )
+inline void InputManager::UpdateMeta( input_item_t *p_item_ )
{
- emit metaChanged( p_item );
+ emit metaChanged( p_item_ );
+ emit artChanged( p_item_ );
}
inline void InputManager::UpdateMeta()
{
+ assert( p_input );
emit currentMetaChanged( input_GetItem( p_input ) );
}
inline void InputManager::UpdateInfo()
{
+ assert( p_input );
emit infoChanged( input_GetItem( p_input ) );
}
emit seekRequested( new_pos );
}
-/* User togglePlayPause */
-void InputManager::togglePlayPause()
-{
- if( hasInput() )
- {
- int state = var_GetInteger( p_input, "state" );
- state = ( state != PLAYING_S ) ? PLAYING_S : PAUSE_S;
- var_SetInteger( p_input, "state", state );
- }
-}
-
void InputManager::sectionPrev()
{
if( hasInput() )
{
if( hasInput() )
{
- float f_rate = var_GetFloat( p_input, "rate" );
- var_SetFloat( p_input, "rate", -f_rate );
+ float f_rate_ = var_GetFloat( p_input, "rate" );
+ var_SetFloat( p_input, "rate", -f_rate_ );
}
}
void InputManager::jumpFwd()
{
int i_interval = var_InheritInteger( p_input, "short-jump-size" );
- if( i_interval > 0 )
+ if( i_interval > 0 && hasInput() )
{
- mtime_t val = (mtime_t)(i_interval) * 1000000L;
+ mtime_t val = CLOCK_FREQ * i_interval;
var_SetTime( p_input, "time-offset", val );
}
}
void InputManager::jumpBwd()
{
int i_interval = var_InheritInteger( p_input, "short-jump-size" );
- if( i_interval > 0 )
+ if( i_interval > 0 && hasInput() )
{
- mtime_t val = -1 *(mtime_t)(i_interval) * 1000000L;
+ mtime_t val = -CLOCK_FREQ * i_interval;
var_SetTime( p_input, "time-offset", val );
}
}
/* Function called regularly when in an AtoB loop */
void InputManager::AtoBLoop( float, int64_t i_time, int )
{
- if( timeB )
- {
- if( i_time >= timeB || i_time < timeA )
- var_SetTime( THEMIM->getInput(), "time" , timeA );
- }
+ if( timeB && i_time >= timeB )
+ var_SetTime( THEMIM->getInput(), "time" , timeA );
}
/**********************************************************************
* 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 )
+ : QObject(NULL), p_intf( _p_intf ),
+ random( VLC_OBJECT(THEPL), "random" ),
+ repeat( VLC_OBJECT(THEPL), "repeat" ), loop( VLC_OBJECT(THEPL), "loop" ),
+ volume( VLC_OBJECT(THEPL), "volume" ), mute( VLC_OBJECT(THEPL), "mute" )
{
p_input = NULL;
im = new InputManager( this, p_intf );
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 );
+ random.addCallback( this, SLOT(notifyRandom(bool)) );
+ repeat.addCallback( this, SLOT(notifyRepeatLoop(bool)) );
+ loop.addCallback( this, SLOT(notifyRepeatLoop(bool)) );
- var_AddCallback( THEPL, "volume-change", VolumeChanged, this );
- var_AddCallback( THEPL, "volume-muted", SoundMuteChanged, this );
+ volume.addCallback( this, SLOT(notifyVolume(float)) );
+ mute.addCallback( this, SLOT(notifyMute(bool)) );
/* Warn our embedded IM about input changes */
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 );
+ /* initialize p_input (an input can already be running) */
+ 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 );
- }
+ emit inputChanged( p_input );
+
+ /* Audio Menu */
+ menusAudioMapper = new QSignalMapper();
+ CONNECT( menusAudioMapper, mapped(QString), this, menusUpdateAudio( QString ) );
}
MainInputManager::~MainInputManager()
if( p_input )
{
emit inputChanged( NULL );
- var_DelCallback( p_input, "state", PLItemChanged, this );
vlc_object_release( p_input );
}
- 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 );
+ delete menusAudioMapper;
}
vout_thread_t* MainInputManager::getVout()
return p_input ? input_GetVout( p_input ) : NULL;
}
-aout_instance_t * MainInputManager::getAout()
+audio_output_t * MainInputManager::getAout()
{
- return p_input ? input_GetAout( p_input ) : NULL;
+ return playlist_GetAout( THEPL );
}
void MainInputManager::customEvent( QEvent *event )
int type = event->type();
PLEvent *plEv;
- IMEvent *imEv;
// msg_Dbg( p_intf, "New MainIM Event of type: %i", type );
switch( type )
{
- case VolumeChanged_Type:
- emit volumeChanged();
- return;
- case SoundMuteChanged_Type:
- emit soundMuteChanged();
- return;
- case PLItemAppended_Type:
+ case PLEvent::PLItemAppended:
plEv = static_cast<PLEvent*>( event );
- emit playlistItemAppended( plEv->i_item, plEv->i_parent );
+ emit playlistItemAppended( plEv->getItemId(), plEv->getParentId() );
return;
- case PLItemRemoved_Type:
+ case PLEvent::PLItemRemoved:
plEv = static_cast<PLEvent*>( event );
- emit playlistItemRemoved( plEv->i_item );
+ emit playlistItemRemoved( plEv->getItemId() );
return;
- case RandomChanged_Type:
- emit randomChanged( var_GetBool( THEPL, "random" ) );
+ case PLEvent::PLEmpty:
+ plEv = static_cast<PLEvent*>( event );
+ emit playlistNotEmpty( plEv->getItemId() >= 0 );
return;
- case LoopChanged_Type:
- case RepeatChanged_Type:
- notifyRepeatLoop();
+ case PLEvent::LeafToParent:
+ plEv = static_cast<PLEvent*>( event );
+ emit leafBecameParent( plEv->getItemId() );
return;
- case LeafToParent_Type:
- imEv = static_cast<IMEvent*>( event );
- emit leafBecameParent( imEv->p_item );
default:
- if( type != ItemChanged_Type ) return;
+ if( type != IMEvent::ItemChanged ) return;
}
- /* Should be PLItemChanged Event */
- if( !p_intf->p_sys->b_isDialogProvider )
- {
- if( p_input && ( p_input->b_dead || !vlc_object_alive (p_input) ) )
- {
- emit inputChanged( p_input );
- var_DelCallback( p_input, "state", PLItemChanged, this );
- vlc_object_release( p_input );
- p_input = NULL;
- return;
- }
-
- if( !p_input )
- {
- p_input = playlist_CurrentInput(THEPL);
- if( p_input )
- {
- var_AddCallback( p_input, "state", PLItemChanged, this );
- emit inputChanged( p_input );
- }
- }
- }
- else
- {
- /* remove previous stored p_input */
- if( p_input )
- {
- vlc_object_release( p_input );
- p_input = NULL;
- }
- /* we are working as a dialogs provider */
- p_input = playlist_CurrentInput( pl_Get(p_intf) );
- if( p_input )
- {
- emit inputChanged( p_input );
- }
- }
+ if( p_input != NULL )
+ vlc_object_release( p_input );
+ p_input = playlist_CurrentInput( THEPL );
+ emit inputChanged( p_input );
}
/* Playlist Control functions */
playlist_Prev( THEPL );
}
+void MainInputManager::prevOrReset()
+{
+ if( !p_input || var_GetTime( p_input , "time") < 10000 )
+ playlist_Prev( THEPL );
+ else
+ getIM()->sliderUpdate( 0.0 );
+}
+
void MainInputManager::togglePlayPause()
{
/* No input, play */
if( !p_input )
playlist_Play( THEPL );
else
- getIM()->togglePlayPause();
+ playlist_Pause( THEPL );
}
void MainInputManager::play()
{
if( PLAYING_S != var_GetInteger( p_input, "state" ) )
{
- getIM()->togglePlayPause();
+ playlist_Pause( THEPL );
}
}
}
{
if(p_input && PLAYING_S == var_GetInteger( p_input, "state" ) )
{
- getIM()->togglePlayPause();
+ playlist_Pause( THEPL );
}
}
void MainInputManager::toggleRandom()
{
- var_ToggleBool( THEPL, "random" );
+ config_PutInt( p_intf, "random", var_ToggleBool( THEPL, "random" ) );
}
-void MainInputManager::notifyRepeatLoop()
+void MainInputManager::notifyRandom(bool value)
+{
+ emit randomChanged(value);
+}
+
+void MainInputManager::notifyRepeatLoop(bool)
{
int i_value = var_GetBool( THEPL, "loop" ) * REPEAT_ALL
+ var_GetBool( THEPL, "repeat" ) * REPEAT_ONE;
void MainInputManager::loopRepeatLoopStatus()
{
/* Toggle Normal -> Loop -> Repeat -> Normal ... */
- if( var_GetBool( THEPL, "repeat" ) )
- var_SetBool( THEPL, "repeat", false );
- else if( var_GetBool( THEPL, "loop" ) )
+ bool loop = var_GetBool( THEPL, "loop" );
+ bool repeat = var_GetBool( THEPL, "repeat" );
+
+ if( repeat )
{
- var_SetBool( THEPL, "loop", false );
- var_SetBool( THEPL, "repeat", true );
+ loop = false;
+ repeat = false;
+ }
+ else if( loop )
+ {
+ loop = false;
+ repeat = true;
}
else
- var_SetBool( THEPL, "loop", true );
+ {
+ loop = true;
+ //repeat = false;
+ }
+
+ var_SetBool( THEPL, "loop", loop );
+ var_SetBool( THEPL, "repeat", repeat );
+ config_PutInt( p_intf, "loop", loop );
+ config_PutInt( p_intf, "repeat", repeat );
}
void MainInputManager::activatePlayQuit( bool b_exit )
{
var_SetBool( THEPL, "play-and-exit", b_exit );
+ config_PutInt( p_intf, "play-and-exit", b_exit );
}
+bool MainInputManager::getPlayExitState()
+{
+ return var_InheritBool( THEPL, "play-and-exit" );
+}
+
+bool MainInputManager::hasEmptyPlaylist()
+{
+ playlist_Lock( THEPL );
+ bool b_empty = playlist_IsEmpty( THEPL );
+ playlist_Unlock( THEPL );
+ return b_empty;
+}
/****************************
* 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 )
+ vlc_value_t oldval, vlc_value_t val, void *param )
{
+ VLC_UNUSED( p_this ); VLC_UNUSED( psz_var ); VLC_UNUSED( oldval );
+ VLC_UNUSED( val );
+
MainInputManager *mim = (MainInputManager*)param;
- IMEvent *event = new IMEvent( ItemChanged_Type );
+ IMEvent *event = new IMEvent( IMEvent::ItemChanged );
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 )
{
+ VLC_UNUSED( p_this ); VLC_UNUSED( psz_var ); VLC_UNUSED( oldval );
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;
-}
+ PLEvent *event = new PLEvent( PLEvent::LeafToParent, newval.i_int );
-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 );
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 )
+void MainInputManager::notifyVolume( float volume )
{
- MainInputManager *mim = (MainInputManager*)param;
-
- IMEvent *event = new IMEvent( SoundMuteChanged_Type );
- QApplication::postEvent( mim, event );
- return VLC_SUCCESS;
+ emit volumeChanged( volume );
}
-static int PLItemAppended
-( vlc_object_t * obj, const char *var, vlc_value_t old, vlc_value_t cur, void *data )
+void MainInputManager::notifyMute( bool mute )
{
- 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;
+ emit soundMuteChanged(mute);
}
-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 )
+void MainInputManager::menusUpdateAudio( const QString& data )
{
- MainInputManager *mim = static_cast<MainInputManager*>(data);
-
- IMEvent *event = new IMEvent( RandomChanged_Type );
- QApplication::postEvent( mim, event );
- return VLC_SUCCESS;
+ audio_output_t *aout = getAout();
+ if( aout != NULL )
+ {
+ aout_DeviceSet( aout, qtu(data) );
+ vlc_object_release( aout );
+ }
}
-/* Probably could be merged with next callback */
-static int LoopChanged
+static int PLItemAppended
( vlc_object_t * obj, const char *var, vlc_value_t old, vlc_value_t cur, void *data )
{
+ VLC_UNUSED( obj ); VLC_UNUSED( var ); VLC_UNUSED( old );
MainInputManager *mim = static_cast<MainInputManager*>(data);
+ playlist_add_t *p_add = static_cast<playlist_add_t*>( cur.p_address );
- IMEvent *event = new IMEvent( LoopChanged_Type );
+ PLEvent *event = new PLEvent( PLEvent::PLItemAppended, p_add->i_item, p_add->i_node );
+ QApplication::postEvent( mim, event );
+ event = new PLEvent( PLEvent::PLEmpty, p_add->i_item, 0 );
QApplication::postEvent( mim, event );
return VLC_SUCCESS;
}
-static int RepeatChanged
+static int PLItemRemoved
( vlc_object_t * obj, const char *var, vlc_value_t old, vlc_value_t cur, void *data )
{
+ VLC_UNUSED( var ); VLC_UNUSED( old );
+
+ playlist_t *pl = (playlist_t *) obj;
MainInputManager *mim = static_cast<MainInputManager*>(data);
- IMEvent *event = new IMEvent( RepeatChanged_Type );
+ PLEvent *event = new PLEvent( PLEvent::PLItemRemoved, cur.i_int, 0 );
QApplication::postEvent( mim, event );
+ // can't use playlist_IsEmpty( ) as it isn't true yet
+ if ( pl->items.i_size == 1 ) // lock is held
+ {
+ event = new PLEvent( PLEvent::PLEmpty, -1, 0 );
+ QApplication::postEvent( mim, event );
+ }
return VLC_SUCCESS;
}
projects / vlc / blobdiff