*****************************************************************************/
#define __STDC_FORMAT_MACROS 1
+#define __STDC_CONSTANT_MACROS 1
#ifdef HAVE_CONFIG_H
# include "config.h"
#include <vlc_keys.h>
#include <vlc_url.h>
#include <vlc_strings.h>
+#include <vlc_aout.h>
+#include <vlc_aout_intf.h>
#include <QApplication>
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 *,
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);
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;
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 );
}
void InputManager::UpdateStatus()
void InputManager::UpdateName()
{
+ assert( p_input );
+
/* Update text, name and nowplaying */
QString name;
free( formated );
/* If we have Nothing */
- if( name.isEmpty() )
+ if( name.simplified().isEmpty() )
{
char *uri = input_item_GetURI( input_GetItem( p_input ) );
char *file = uri ? strrchr( uri, '/' ) : NULL;
if( !p_input )
return false;
- aout_instance_t *aout = input_GetAout( p_input );
+ audio_output_t *aout = input_GetAout( p_input );
if( !aout )
return false;
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 );
}
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_ );
}
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 );
}
}
**********************************************************************/
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" )
{
p_input = NULL;
im = new InputManager( this, p_intf );
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", VolumeChanged, this );
var_AddCallback( THEPL, "mute", SoundMuteChanged, this );
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( pl_Get(p_intf) );
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 );
+ if( !p_intf->p_sys->b_isDialogProvider )
+ var_AddCallback( p_input, "state", PLItemChanged, this );
+ emit inputChanged( p_input );
}
}
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 );
-
}
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;
}
int type = event->type();
PLEvent *plEv;
- IMEvent *imEv;
// msg_Dbg( p_intf, "New MainIM Event of type: %i", type );
switch( 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();
+ case PLEmpty_Type:
+ plEv = static_cast<PLEvent*>( event );
+ emit playlistNotEmpty( plEv->i_item >= 0 );
return;
case LeafToParent_Type:
- imEv = static_cast<IMEvent*>( event );
- emit leafBecameParent( imEv->p_item );
+ plEv = static_cast<PLEvent*>( event );
+ emit leafBecameParent( plEv->i_item );
+ return;
default:
if( type != ItemChanged_Type ) return;
}
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::notifyRandom(bool value)
+{
+ emit randomChanged(value);
}
-void MainInputManager::notifyRepeatLoop()
+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 )
+ {
+ loop = false;
+ repeat = false;
+ }
+ else if( loop )
{
- var_SetBool( THEPL, "loop", false );
- var_SetBool( THEPL, "repeat", true );
+ 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 )
return var_GetBool( 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_UNUSED( p_this ); VLC_UNUSED( psz_var ); VLC_UNUSED( oldval );
+
MainInputManager *mim = (MainInputManager*)param;
IMEvent *event = new IMEvent( ItemChanged_Type );
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 ) );
+ PLEvent *event = new PLEvent( LeafToParent_Type, newval.i_int );
+
QApplication::postEvent( mim, 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 )
{
+ VLC_UNUSED( p_this ); VLC_UNUSED( psz_var ); VLC_UNUSED( oldval ); VLC_UNUSED( newval );
+
MainInputManager *mim = (MainInputManager*)param;
IMEvent *event = new IMEvent( VolumeChanged_Type );
static int SoundMuteChanged( 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 ); VLC_UNUSED( newval );
+
MainInputManager *mim = (MainInputManager*)param;
IMEvent *event = new IMEvent( SoundMuteChanged_Type );
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 );
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 );
+ event = new PLEvent( PLEmpty_Type, p_add->i_item, 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
+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);
-
- IMEvent *event = new IMEvent( LoopChanged_Type );
- QApplication::postEvent( mim, event );
- return VLC_SUCCESS;
-}
+ VLC_UNUSED( var ); VLC_UNUSED( old );
-static int RepeatChanged
-( vlc_object_t * obj, const char *var, vlc_value_t old, vlc_value_t cur, void *data )
-{
+ playlist_t *pl = (playlist_t *) obj;
MainInputManager *mim = static_cast<MainInputManager*>(data);
- IMEvent *event = new IMEvent( RepeatChanged_Type );
+ PLEvent *event = new PLEvent( PLItemRemoved_Type, 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( PLEmpty_Type, -1, 0 );
+ QApplication::postEvent( mim, event );
+ }
return VLC_SUCCESS;
}
projects / vlc / blobdiff