#endif
#include "mediacontrol_internal.h"
#include "libvlc_internal.h"
+#include "media_player_internal.h"
#include <vlc/mediacontrol.h>
#include <vlc/libvlc.h>
#include <vlc_vout.h>
+#include <vlc_input.h>
#include <vlc_osd.h>
+#include <vlc_block.h>
#include <stdlib.h> /* malloc(), free() */
#include <string.h>
-#include <errno.h> /* ENOMEM */
#include <stdio.h>
-#include <ctype.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
+#include <sys/types.h>
mediacontrol_RGBPicture *
mediacontrol_snapshot( mediacontrol_Instance *self,
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;
- char path[256];
- snapshot_t *p_snapshot;
+ mediacontrol_RGBPicture *p_pic;
libvlc_exception_t ex;
libvlc_exception_init( &ex );
mediacontrol_exception_init( exception );
- p_input = libvlc_get_input_thread( self->p_media_player, &ex );
+ p_input = libvlc_get_input_thread( self->p_media_player );
if( ! p_input )
{
RAISE_NULL( mediacontrol_InternalException, "No input" );
}
- p_vout = vlc_object_find( p_input, VLC_OBJECT_VOUT, FIND_CHILD );
+
+ p_vout = input_GetVout( p_input );
+ 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 )
+
+ block_t *p_image;
+ video_format_t fmt;
+
+ if( vout_GetSnapshot( p_vout, &p_image, NULL, &fmt, "png", 500*1000 ) )
{
vlc_object_release( p_vout );
- vlc_object_release( p_input );
- RAISE_NULL( mediacontrol_InternalException, "Out of memory" );
+ RAISE_NULL( mediacontrol_InternalException, "Snapshot exception" );
+ return NULL;
}
- snprintf( path, 255, "object:%ju", (uintmax_t)(uintptr_t)p_cache );
- var_SetString( p_vout, "snapshot-path", path );
- var_SetString( p_vout, "snapshot-format", "png" );
-
- vlc_object_lock( p_cache );
- vout_Control( p_vout, VOUT_SNAPSHOT );
- vlc_object_wait( p_cache );
- 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 );
-
- if( p_snapshot )
+ /* */
+ char *p_data = malloc( p_image->i_buffer );
+ if( 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 );
- if( !p_pic )
- {
- free( p_snapshot );
- RAISE_NULL( mediacontrol_InternalException, "Out of memory" );
- }
+ memcpy( p_data, p_image->p_buffer, p_image->i_buffer );
+ p_pic = private_mediacontrol_createRGBPicture( fmt.i_width,
+ fmt.i_height,
+ fmt.i_chroma,
+ p_image->i_pts,
+ p_data,
+ p_image->i_buffer );
}
else
{
- RAISE_NULL( mediacontrol_InternalException, "Snapshot exception" );
+ p_pic = NULL;
}
+ block_Release( p_image );
+
+ if( !p_pic )
+ RAISE_NULL( mediacontrol_InternalException, "Out of memory" );
+
+ vlc_object_release( p_vout );
return p_pic;
}
int i_flags, int i_hmargin, int i_vmargin,
mtime_t i_start, mtime_t i_stop )
{
- return osd_ShowTextAbsolute( p_vout->p_spu, i_channel,
+ return osd_ShowTextAbsolute( vout_GetSpu( p_vout ), i_channel,
psz_string, p_style,
i_flags, i_hmargin, i_vmargin,
i_start, i_stop );
RAISE_VOID( mediacontrol_InternalException, "Empty text" );
}
- p_input = libvlc_get_input_thread( self->p_media_player, &ex );
+ p_input = libvlc_get_input_thread( self->p_media_player );
if( ! p_input )
{
RAISE_VOID( mediacontrol_InternalException, "No input" );
}
- p_vout = vlc_object_find( p_input, VLC_OBJECT_VOUT, FIND_CHILD );
+ p_vout = input_GetVout( p_input );
+ /*FIXME: take care of the next fixme that can use p_input */
+ vlc_object_release( p_input );
+
if( ! p_vout )
{
RAISE_VOID( mediacontrol_InternalException, "No video output" );
mediacontrol_sound_get_volume( mediacontrol_Instance *self,
mediacontrol_Exception *exception )
{
- libvlc_exception_t ex;
int i_ret = 0;
mediacontrol_exception_init( exception );
- libvlc_exception_init( &ex );
- i_ret = libvlc_audio_get_volume( self->p_instance, &ex );
- HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
+ //i_ret = libvlc_audio_get_volume( self->p_instance );
+#warning FIXME: unimplented
/* FIXME: Normalize in [0..100] */
return (unsigned short)i_ret;
}
mediacontrol_Exception *exception )
{
/* FIXME: Normalize in [0..100] */
- libvlc_exception_t ex;
-
mediacontrol_exception_init( exception );
- libvlc_exception_init( &ex );
- libvlc_audio_set_volume( self->p_instance, volume, &ex );
- HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
+ //libvlc_audio_set_volume( self->p_instance, volume );
+#warning FIXME: unimplented
}
int mediacontrol_set_visual( mediacontrol_Instance *self,
WINDOWHANDLE visual_id,
mediacontrol_Exception *exception )
{
- libvlc_exception_t ex;
-
mediacontrol_exception_init( exception );
- libvlc_exception_init( &ex );
-
- libvlc_media_player_set_drawable( self->p_media_player, (libvlc_drawable_t)visual_id, &ex );
- HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
+#ifdef WIN32
+ libvlc_media_player_set_hwnd( self->p_media_player, visual_id );
+#else
+ libvlc_media_player_set_xwindow( self->p_media_player, visual_id );
+#endif
return true;
}
mediacontrol_get_rate( mediacontrol_Instance *self,
mediacontrol_Exception *exception )
{
- libvlc_exception_t ex;
int i_ret;
mediacontrol_exception_init( exception );
- libvlc_exception_init( &ex );
-
- i_ret = libvlc_media_player_get_rate( self->p_media_player, &ex );
- HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
+ i_ret = libvlc_media_player_get_rate( self->p_media_player );
- return i_ret / 10;
+ return (i_ret >= 0) ? (i_ret / 10) : -1;
}
void
const int rate,
mediacontrol_Exception *exception )
{
- libvlc_exception_t ex;
-
mediacontrol_exception_init( exception );
- libvlc_exception_init( &ex );
- libvlc_media_player_set_rate( self->p_media_player, rate * 10, &ex );
- HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
+ libvlc_media_player_set_rate( self->p_media_player, rate * 10 );
}
int
projects / vlc / blobdiff