mediacontrol_Exception *exception )
{
(void)a_position;
- vlc_object_t* p_cache;
vout_thread_t* p_vout;
input_thread_t *p_input;
mediacontrol_RGBPicture *p_pic = NULL;
libvlc_exception_init( &ex );
mediacontrol_exception_init( exception );
+
+ p_snapshot = malloc( sizeof( snapshot_t ) );
+ if( ! p_snapshot )
+ {
+ RAISE_NULL( mediacontrol_InternalException, "Cannot allocate snapshot" );
+ }
+
p_input = libvlc_get_input_thread( self->p_media_player, &ex );
if( ! p_input )
{
RAISE_NULL( mediacontrol_InternalException, "No input" );
}
+
p_vout = vlc_object_find( p_input, VLC_OBJECT_VOUT, FIND_CHILD );
+ vlc_object_release( p_input );
if( ! p_vout )
{
RAISE_NULL( mediacontrol_InternalException, "No video output" );
}
- p_cache = vlc_object_create( p_input, sizeof( vlc_object_t ) );
- if( p_cache == NULL )
- {
- vlc_object_release( p_vout );
- vlc_object_release( p_input );
- RAISE_NULL( mediacontrol_InternalException, "Out of memory" );
- }
- snprintf( path, 255, "object:%ju", (uintmax_t)(uintptr_t)p_cache );
+
+ /* TODO:
+ vlc_mutex_lock (&lock);
+ mutex_cleanup_push (&lock); // release the mutex in case of cancellation
+
+ while (!foobar)
+ vlc_cond_wait (&wait, &lock);
+
+ --- foobar is now true, do something about it here --
+
+ vlc_cleanup_run (); // release the mutex
+ */
+
+ snprintf( path, 255, "object:%p", p_snapshot );
var_SetString( p_vout, "snapshot-path", path );
var_SetString( p_vout, "snapshot-format", "png" );
- vlc_object_lock( p_cache );
+ vlc_mutex_init( &p_snapshot->p_mutex );
+ vlc_cond_init( &p_snapshot->p_condvar );
+
+ vlc_mutex_lock( &p_snapshot->p_mutex );
+ mutex_cleanup_push( &p_snapshot->p_mutex );
+
+ /* Use p_snapshot address as sentinel against spurious vlc_object_wait wakeups.
+
+ If a legitimate wakeup occurs, then p_snapshot->p_data will hold either
+ NULL (in case of error) or a pointer to valid data. */
+ p_snapshot->p_data = ( char* )p_snapshot;
+
vout_Control( p_vout, VOUT_SNAPSHOT );
- vlc_object_wait( p_cache );
+ while ( p_snapshot->p_data == ( char* )p_snapshot )
+ {
+ vlc_cond_wait( &p_snapshot->p_condvar, &p_snapshot->p_mutex );
+ }
+ vlc_cleanup_pop();
+
vlc_object_release( p_vout );
- p_snapshot = ( snapshot_t* ) p_cache->p_private;
- vlc_object_unlock( p_cache );
- vlc_object_release( p_cache );
- vlc_object_release( p_input );
+ vlc_mutex_unlock( &p_snapshot->p_mutex );
+ vlc_cond_destroy( &p_snapshot->p_condvar );
+ vlc_mutex_destroy( &p_snapshot->p_mutex );
- if( p_snapshot )
+ if( p_snapshot->p_data )
{
+ /* Note: p_snapshot->p_data is directly used, not copied. Thus
+ do not free it here. */
p_pic = private_mediacontrol_createRGBPicture( p_snapshot->i_width,
- p_snapshot->i_height,
- VLC_FOURCC( 'p','n','g',' ' ),
- p_snapshot->date,
- p_snapshot->p_data,
- p_snapshot->i_datasize );
+ p_snapshot->i_height,
+ VLC_FOURCC( 'p','n','g',' ' ),
+ p_snapshot->date,
+ p_snapshot->p_data,
+ p_snapshot->i_datasize );
if( !p_pic )
{
- free( p_snapshot->p_data );
free( p_snapshot );
RAISE_NULL( mediacontrol_InternalException, "Out of memory" );
}
static
int mediacontrol_showtext( vout_thread_t *p_vout, int i_channel,
- char *psz_string, text_style_t *p_style,
+ const char *psz_string, text_style_t *p_style,
int i_flags, int i_hmargin, int i_vmargin,
mtime_t i_start, mtime_t i_stop )
{
- subpicture_t *p_spu;
- video_format_t fmt;
-
- if( !psz_string ) return VLC_EGENERIC;
-
- p_spu = spu_CreateSubpicture( p_vout->p_spu );
- if( !p_spu ) return VLC_EGENERIC;
-
- /* Create a new subpicture region */
- memset( &fmt, 0, sizeof(video_format_t) );
- fmt.i_chroma = VLC_FOURCC('T','E','X','T');
- fmt.i_aspect = 0;
- fmt.i_width = fmt.i_height = 0;
- fmt.i_x_offset = fmt.i_y_offset = 0;
- p_spu->p_region = p_spu->pf_create_region( VLC_OBJECT(p_vout), &fmt );
- if( !p_spu->p_region )
- {
- msg_Err( p_vout, "cannot allocate SPU region" );
- spu_DestroySubpicture( p_vout->p_spu, p_spu );
- return VLC_EGENERIC;
- }
-
- p_spu->p_region->psz_text = strdup( psz_string );
- p_spu->p_region->i_align = i_flags & SUBPICTURE_ALIGN_MASK;
- p_spu->p_region->p_style = p_style;
- p_spu->i_start = i_start;
- p_spu->i_stop = i_stop;
- p_spu->b_ephemer = false;
- p_spu->b_absolute = false;
-
- p_spu->i_x = i_hmargin;
- p_spu->i_y = i_vmargin;
- p_spu->i_flags = i_flags & ~SUBPICTURE_ALIGN_MASK;
- p_spu->i_channel = i_channel;
-
- spu_DisplaySubpicture( p_vout->p_spu, p_spu );
-
- return VLC_SUCCESS;
+ return osd_ShowTextAbsolute( p_vout->p_spu, i_channel,
+ psz_string, p_style,
+ i_flags, i_hmargin, i_vmargin,
+ i_start, i_stop );
}
mediacontrol_Exception *exception )
{
vout_thread_t *p_vout = NULL;
- char* psz_message;
input_thread_t *p_input;
libvlc_exception_t ex;
libvlc_exception_init( &ex );
mediacontrol_exception_init( exception );
+ if( !message )
+ {
+ RAISE_VOID( mediacontrol_InternalException, "Empty text" );
+ }
+
p_input = libvlc_get_input_thread( self->p_media_player, &ex );
if( ! p_input )
{
RAISE_VOID( mediacontrol_InternalException, "No video output" );
}
- psz_message = strdup( message );
- if( !psz_message )
- {
- RAISE_VOID( mediacontrol_InternalException, "no more memory" );
- }
-
if( begin->origin == mediacontrol_RelativePosition &&
begin->value == 0 &&
end->origin == mediacontrol_RelativePosition )
mediacontrol_MediaTime,
end->value );
- mediacontrol_showtext( p_vout, DEFAULT_CHAN, psz_message, NULL,
+ mediacontrol_showtext( p_vout, DEFAULT_CHAN, message, NULL,
OSD_ALIGN_BOTTOM | OSD_ALIGN_LEFT, 0, 0,
i_now, i_now + i_duration );
}
( mediacontrol_Position * ) end );
i_fin += i_now;
- vout_ShowTextAbsolute( p_vout, DEFAULT_CHAN, psz_message, NULL,
+ vout_ShowTextAbsolute( p_vout, DEFAULT_CHAN, message, NULL,
OSD_ALIGN_BOTTOM | OSD_ALIGN_LEFT, 0, 0,
i_debut, i_fin );
}
projects / vlc / blobdiff