#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,
if( vout_GetSnapshot( p_vout, &p_image, NULL, &fmt, "png", 500*1000 ) )
{
+ vlc_object_release( p_vout );
RAISE_NULL( mediacontrol_InternalException, "Snapshot exception" );
return NULL;
}
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, "No input" );
}
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 );
/* FIXME: Normalize in [0..100] */
return (unsigned short)i_ret;
}
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;
}