QObject( parent ), p_intf( _p_intf )
{
i_old_playing_status = END_S;
+ old_name = "";
p_input = NULL;
+ i_rate = 0;
ON_TIMEOUT( update() );
}
}
}
+//TODO break that
void InputManager::update()
{
/// \todo Emit the signals only if it changed
- if( !p_input ) return;
+ if( !p_input )
+ {
+ emit nameChanged( "" );
+ return;
+ }
if( p_input->b_dead || p_input->b_die )
{
emit positionUpdated( 0.0, 0, 0 );
- msg_Dbg( p_intf, "*********** NAV 0");
emit navigationChanged( 0 );
- emit statusChanged( 0 ); // 0 = STOPPED, 1 = PLAY, 2 = PAUSE
+ i_old_playing_status = 0;
+ emit statusChanged( END_S ); // see vlc_input.h, input_state_e enum
delInput();
return;
}
- if( !b_had_audio && b_has_audio )
- emit audioStarted();
- if( !b_had_video && b_has_video )
- emit videoStarted();
-
/* 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" );
emit positionUpdated( f_pos, i_time, i_length );
- /* Update disc status */
+ /* 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 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 );
- if( val.i_int > 0 )
+ emit navigationChanged( (val.i_int > 0) ? 1 : 2 );
+ /*if( val.i_int > 0 )
{
- msg_Dbg( p_intf, "******* CHAPTER");
emit navigationChanged( 1 ); // 1 = chapter, 2 = title, 0 = NO
}
else
{
- msg_Dbg( p_intf, "******* TITLE");
emit navigationChanged( 2 );
- }
+ }*/
}
else
{
emit navigationChanged( 0 );
}
+#ifdef ZVBI_COMPILED
+ /* Update teletext status*/
+ emit teletextEnabled( true );/* FIXME */
+#endif
+
/* Update text */
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 ) );
+ char *psz_nowplaying =
+ input_item_GetNowPlaying( input_GetItem( p_input ) );
+ char *psz_artist = input_item_GetArtist( input_GetItem( p_input ) );
+ if( EMPTY_STR( psz_name ) )
+ {
+ free( psz_name );
+ psz_name = input_item_GetName( input_GetItem( p_input ) );
+ }
+ if( !EMPTY_STR( psz_nowplaying ) )
+ {
+ text.sprintf( "%s - %s", psz_nowplaying, psz_name );
+ }
+ else if( !EMPTY_STR( psz_artist ) )
{
- text.sprintf( "%s - %s",
- input_GetItem(p_input)->p_meta->psz_nowplaying,
- input_GetItem(p_input)->psz_name );
+ text.sprintf( "%s - %s", psz_artist, psz_name );
}
else
{
- text.sprintf( "%s", input_GetItem(p_input)->psz_name );
+ text.sprintf( "%s", psz_name );
+ }
+ free( psz_name );
+ free( psz_nowplaying );
+ free( psz_artist );
+ if( old_name != text )
+ {
+ emit nameChanged( text );
+ old_name=text;
}
- emit nameChanged( text );
/* Update playing status */
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 == PAUSE_S ? PAUSE_S : PLAYING_S );
+ emit statusChanged( val.i_int == PAUSE_S ? PAUSE_S : PLAYING_S );
}
}
void InputManager::sliderUpdate( float new_pos )
{
- if( hasInput() )
- var_SetFloat( p_input, "position", new_pos );
+ if( hasInput() ) var_SetFloat( p_input, "position", new_pos );
}
void InputManager::togglePlayPause()
{
vlc_value_t state;
var_Get( p_input, "state", &state );
- if( state.i_int != PAUSE_S )
- {
+ state.i_int = ( ( state.i_int != PAUSE_S ) ? PAUSE_S : PLAYING_S );
+ /*{
/* A stream is being played, pause it */
- state.i_int = PAUSE_S;
+ /* state.i_int = PAUSE_S;
}
else
{
/* Stream is paused, resume it */
- state.i_int = PLAYING_S;
- }
+ /*state.i_int = PLAYING_S;
+ }*/
var_Set( p_input, "state", state );
emit statusChanged( state.i_int );
}
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 = 0;
+
+ if( b_enabled )
+ i_page = 100;
+ 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() )
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
void MainInputManager::updateInput()
{
- vlc_mutex_lock( &p_intf->change_lock );
- if( p_input && p_input->b_dead )
+ if( VLC_OBJECT_INTF == p_intf->i_object_type )
{
- vlc_object_release( p_input );
- getIM()->delInput();
- p_input = NULL;
- emit inputChanged( NULL );
- }
+ vlc_mutex_lock( &p_intf->change_lock );
+ if( p_input && p_input->b_dead )
+ {
+ vlc_object_release( p_input );
+ getIM()->delInput();
+ p_input = NULL;
+ emit inputChanged( NULL );
+ }
- if( !p_input )
- {
- QPL_LOCK;
- p_input = THEPL->p_input;
- if( p_input )
+ if( !p_input )
+ {
+ QPL_LOCK;
+ p_input = THEPL->p_input;
+ if( p_input )
+ {
+ vlc_object_yield( p_input );
+ emit inputChanged( p_input );
+ }
+ 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 )
{
- vlc_object_yield( p_input );
+ p_input = p_playlist->p_input;
emit inputChanged( p_input );
}
- QPL_UNLOCK;
}
- vlc_mutex_unlock( &p_intf->change_lock );
}
void MainInputManager::stop()
{
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,
{
InputManager *im = (InputManager*)param;
im->b_has_video = true;
- return 0;
+ return VLC_SUCCESS;
}
projects / vlc / blobdiff