/* Reattach video output to playlist before bailing out */
if( p_vout )
{
- spu_Attach( p_vout->p_spu, p_this, VLC_FALSE );
+ spu_Attach( p_vout->p_spu, p_this, false );
vlc_object_detach( p_vout );
vlc_object_attach( p_vout, p_this->p_libvlc );
}
if( !psz_filter_chain && !p_vout->psz_filter_chain )
{
- p_vout->b_filter_change = VLC_FALSE;
+ p_vout->b_filter_change = false;
}
free( psz_filter_chain );
else
{
/* This video output is cool! Hijack it. */
- spu_Attach( p_vout->p_spu, p_this, VLC_TRUE );
+ spu_Attach( p_vout->p_spu, p_this, true );
vlc_object_attach( p_vout, p_this );
if( p_vout->b_title_show )
DisplayTitleOnOSD( p_vout );
p_vout->i_par_num = p_vout->i_par_den = 1;
/* Initialize locks */
- vlc_mutex_init( p_vout, &p_vout->picture_lock );
- vlc_mutex_init( p_vout, &p_vout->change_lock );
- vlc_mutex_init( p_vout, &p_vout->vfilter_lock );
+ vlc_mutex_init( &p_vout->picture_lock );
+ vlc_mutex_init( &p_vout->change_lock );
+ vlc_mutex_init( &p_vout->vfilter_lock );
/* Mouse coordinates */
var_Create( p_vout, "mouse-x", VLC_VAR_INTEGER );
/* Initialize subpicture unit */
p_vout->p_spu = spu_Create( p_vout );
- spu_Attach( p_vout->p_spu, p_parent, VLC_TRUE );
+ spu_Attach( p_vout->p_spu, p_parent, true );
/* Attach the new object now so we can use var inheritance below */
vlc_object_attach( p_vout, p_parent );
}
var_AddCallback( p_vout, "video-filter", VideoFilter2Callback, NULL );
- p_vout->b_vfilter_change = VLC_TRUE;
+ p_vout->b_vfilter_change = true;
p_vout->i_vfilters = 0;
/* Choose the video output module */
}
if( vlc_thread_create( p_vout, "video output", RunThread,
- VLC_THREAD_PRIORITY_OUTPUT, VLC_TRUE ) )
+ VLC_THREAD_PRIORITY_OUTPUT, true ) )
{
msg_Err( p_vout, "out of memory" );
module_Unneed( p_vout, p_vout->p_module );
#ifndef __APPLE__
vout_thread_t *p_another_vout;
- playlist_t *p_playlist = pl_Get( p_vout );
- if( p_playlist->b_die ) return;
- vlc_object_yield( p_playlist );
-/* This is a dirty hack for mostly Linux, where there is no way to get the GUI
- back if you closed it while playing video. This is solved in Mac OS X,
- where we have this novelty called menubar, that will always allow you access
- to the applications main functionality. They should try that on linux sometime */
- p_another_vout = vlc_object_find( p_this->p_libvlc,
- VLC_OBJECT_VOUT, FIND_ANYWHERE );
- if( p_another_vout == NULL )
- {
- vlc_value_t val;
- val.b_bool = VLC_TRUE;
- var_Set( p_playlist, "intf-show", val );
- }
+ playlist_t *p_playlist = vlc_object_find( p_this->p_libvlc,
+ VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ if( !p_playlist )
+ return;
+
+ /* This is a dirty hack mostly for Linux, where there is no way to get the
+ * GUI back if you closed it while playing video. This is solved in
+ * Mac OS X, where we have this novelty called menubar, that will always
+ * allow you access to the applications main functionality. They should try
+ * that on linux sometime. */
+ p_another_vout = vlc_object_find( p_this->p_libvlc,
+ VLC_OBJECT_VOUT, FIND_ANYWHERE );
+ if( p_another_vout == NULL )
+ var_SetBool( p_playlist, "intf-show", true );
else
- {
vlc_object_release( p_another_vout );
- }
vlc_object_release( p_playlist );
#endif
}
input_thread_t *p_input = NULL ; /* Parent input, if it exists */
vlc_value_t val;
- vlc_bool_t b_drop_late;
+ bool b_drop_late;
int i_displayed = 0, i_lost = 0, i_loops = 0;
p_picture->i_status = DESTROYED_PICTURE;
p_vout->i_heap_size--;
}
- msg_Warn( p_vout, "late picture skipped ("I64Fd")",
+ msg_Warn( p_vout, "late picture skipped (%"PRId64")",
current_date - display_date );
i_lost++;
vlc_mutex_unlock( &p_vout->picture_lock );
}
i_lost++;
msg_Warn( p_vout, "vout warning: early picture skipped "
- "("I64Fd")", display_date - current_date
+ "(%"PRId64")", display_date - current_date
- p_vout->i_pts_delay );
vlc_mutex_unlock( &p_vout->picture_lock );
}
/* Video Filter2 stuff */
- if( p_vout->b_vfilter_change == VLC_TRUE )
+ if( p_vout->b_vfilter_change == true )
{
int i;
vlc_mutex_lock( &p_vout->vfilter_lock );
p_vfilter->p_cfg = p_vout->p_vfilters_cfg[i];
p_vfilter->p_module = module_Need( p_vfilter, "video filter2",
p_vout->psz_vfilters[i],
- VLC_TRUE );
+ true );
if( p_vfilter->p_module )
{
vlc_object_release( p_vfilter );
}
}
- p_vout->b_vfilter_change = VLC_FALSE;
+ p_vout->b_vfilter_change = false;
vlc_mutex_unlock( &p_vout->vfilter_lock );
}
if( p_picture && p_vout->b_snapshot )
{
- p_vout->b_snapshot = VLC_FALSE;
+ p_vout->b_snapshot = false;
vout_Snapshot( p_vout, p_picture );
}
FIND_PARENT );
}
p_subpic = spu_SortSubpictures( p_vout->p_spu, display_date,
- p_input ? var_GetBool( p_input, "state" ) == PAUSE_S : VLC_FALSE );
+ p_input ? var_GetBool( p_input, "state" ) == PAUSE_S : false );
if( p_input )
vlc_object_release( p_input );
p_input = NULL;
}
/* Destroy subpicture unit */
- spu_Attach( p_vout->p_spu, VLC_OBJECT(p_vout), VLC_FALSE );
+ spu_Attach( p_vout->p_spu, VLC_OBJECT(p_vout), false );
spu_Destroy( p_vout->p_spu );
/* Destroy the video filters2 */
vout_thread_t * p_vout = (vout_thread_t *)p_this;
vlc_value_t val;
(void)psz_variable; (void)newval; (void)oldval; (void)p_data;
- val.b_bool = VLC_TRUE;
+ val.b_bool = true;
var_Set( p_vout, "intf-change", val );
return VLC_SUCCESS;
}
}
vlc_object_release( p_input );
- val.b_bool = VLC_TRUE;
+ val.b_bool = true;
var_Set( p_vout, "intf-change", val );
val.psz_string = psz_filter;
return( VLC_EGENERIC );
}
- val.b_bool = VLC_TRUE;
+ val.b_bool = true;
var_Set( p_vout, "intf-change", val );
/* Modify input as well because the vout might have to be restarted */
suxor_thread_t *p_suxor =
vlc_object_create( p_vout, sizeof(suxor_thread_t) );
p_suxor->p_input = p_input;
- p_vout->b_filter_change = VLC_TRUE;
+ p_vout->b_filter_change = true;
vlc_object_yield( p_input );
vlc_thread_create( p_suxor, "suxor", SuxorRestartVideoES,
- VLC_THREAD_PRIORITY_LOW, VLC_FALSE );
+ VLC_THREAD_PRIORITY_LOW, false );
}
vlc_object_release( p_input );
vlc_mutex_lock( &p_vout->vfilter_lock );
ParseVideoFilter2Chain( p_vout, newval.psz_string );
- p_vout->b_vfilter_change = VLC_TRUE;
+ p_vout->b_vfilter_change = true;
vlc_mutex_unlock( &p_vout->vfilter_lock );
return VLC_SUCCESS;