Commit accf423b authored by Laurent Aimar's avatar Laurent Aimar

Removed display of title by goom visualization plugin.

It is not reliable if the aout is reused, and the text support seems
incomplete in goom.
parent a8d9ae66
...@@ -85,8 +85,6 @@ typedef struct ...@@ -85,8 +85,6 @@ typedef struct
vout_thread_t *p_vout; vout_thread_t *p_vout;
int i_speed; int i_speed;
char *psz_title;
vlc_mutex_t lock; vlc_mutex_t lock;
vlc_cond_t wait; vlc_cond_t wait;
bool b_exit; bool b_exit;
...@@ -112,8 +110,6 @@ static block_t *DoWork ( filter_t *, block_t * ); ...@@ -112,8 +110,6 @@ static block_t *DoWork ( filter_t *, block_t * );
static void *Thread( void * ); static void *Thread( void * );
static char *TitleGet( vlc_object_t * );
/***************************************************************************** /*****************************************************************************
* Open: open a scope effect plugin * Open: open a scope effect plugin
*****************************************************************************/ *****************************************************************************/
...@@ -176,8 +172,6 @@ static int Open( vlc_object_t *p_this ) ...@@ -176,8 +172,6 @@ static int Open( vlc_object_t *p_this )
date_Set( &p_thread->date, 0 ); date_Set( &p_thread->date, 0 );
p_thread->i_channels = aout_FormatNbChannels( &p_filter->fmt_in.audio ); p_thread->i_channels = aout_FormatNbChannels( &p_filter->fmt_in.audio );
p_thread->psz_title = TitleGet( VLC_OBJECT( p_filter ) );
if( vlc_clone( &p_thread->thread, if( vlc_clone( &p_thread->thread,
Thread, p_thread, VLC_THREAD_PRIORITY_LOW ) ) Thread, p_thread, VLC_THREAD_PRIORITY_LOW ) )
{ {
...@@ -185,7 +179,6 @@ static int Open( vlc_object_t *p_this ) ...@@ -185,7 +179,6 @@ static int Open( vlc_object_t *p_this )
vlc_object_release( p_thread->p_vout ); vlc_object_release( p_thread->p_vout );
vlc_mutex_destroy( &p_thread->lock ); vlc_mutex_destroy( &p_thread->lock );
vlc_cond_destroy( &p_thread->wait ); vlc_cond_destroy( &p_thread->wait );
free( p_thread->psz_title );
free( p_thread ); free( p_thread );
free( p_sys ); free( p_sys );
return VLC_EGENERIC; return VLC_EGENERIC;
...@@ -344,10 +337,7 @@ static void *Thread( void *p_thread_data ) ...@@ -344,10 +337,7 @@ static void *Thread( void *p_thread_data )
if( date_Get( &i_pts ) + GOOM_DELAY <= mdate() ) continue; if( date_Get( &i_pts ) + GOOM_DELAY <= mdate() ) continue;
plane = goom_update( p_plugin_info, p_data, 0, 0.0, plane = goom_update( p_plugin_info, p_data, 0, 0.0,
p_thread->psz_title, NULL ); NULL, NULL );
free( p_thread->psz_title );
p_thread->psz_title = NULL;
while( !( p_pic = vout_GetPicture( p_thread->p_vout ) ) ) while( !( p_pic = vout_GetPicture( p_thread->p_vout ) ) )
{ {
...@@ -403,14 +393,3 @@ static void Close( vlc_object_t *p_this ) ...@@ -403,14 +393,3 @@ static void Close( vlc_object_t *p_this )
free( p_sys ); free( p_sys );
} }
static char *TitleGet( vlc_object_t *p_this )
{
input_thread_t *p_input = playlist_CurrentInput( pl_Get( p_this ) );
if( p_input )
{
char *psz_title = input_item_GetTitleFbName( input_GetItem( p_input ) );
vlc_object_release( p_input );
return psz_title;
}
return NULL;
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment