* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include "mediacontrol_internal.h"
#include <vlc/mediacontrol.h>
var_SetString( p_vout, "snapshot-path", path );
var_SetString( p_vout, "snapshot-format", "png" );
- vlc_mutex_lock( &p_cache->object_lock );
+ vlc_object_lock( p_cache );
vout_Control( p_vout, VOUT_SNAPSHOT );
- vlc_cond_wait( &p_cache->object_wait, &p_cache->object_lock );
+ vlc_object_wait( p_cache );
vlc_object_release( p_vout );
p_snapshot = ( snapshot_t* ) p_cache->p_private;
- vlc_object_destroy( p_cache );
+ vlc_object_unlock( p_cache );
+ vlc_object_release( p_cache );
if( p_snapshot )
{
- p_pic = _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_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->p_data );
mtime_t i_duration = 0;
mtime_t i_now = mdate();
- i_duration = 1000 * mediacontrol_unit_convert(
+ i_duration = 1000 * private_mediacontrol_unit_convert(
self->p_playlist->p_input,
end->key,
mediacontrol_MediaTime,
/* i_now = input_ClockGetTS( p_input, NULL, 0 ); */
i_now = mdate();
- i_debut = mediacontrol_position2microsecond( p_input,
+ i_debut = private_mediacontrol_position2microsecond( p_input,
( mediacontrol_Position* ) begin );
i_debut += i_now;
- i_fin = mediacontrol_position2microsecond( p_input,
+ i_fin = private_mediacontrol_position2microsecond( p_input,
( mediacontrol_Position * ) end );
i_fin += i_now;
int
mediacontrol_get_rate( mediacontrol_Instance *self,
- mediacontrol_Exception *exception )
+ mediacontrol_Exception *exception )
{
libvlc_exception_t ex;
libvlc_media_instance_t* p_mi;
HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
i_ret = libvlc_media_instance_get_rate( p_mi, &ex );
- libvlc_media_instance_destroy_and_detach( p_mi );
+ libvlc_media_instance_release( p_mi );
HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
return i_ret / 10;
void
mediacontrol_set_rate( mediacontrol_Instance *self,
- const int rate,
- mediacontrol_Exception *exception )
+ const int rate,
+ mediacontrol_Exception *exception )
{
libvlc_exception_t ex;
libvlc_media_instance_t* p_mi;
HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
libvlc_media_instance_set_rate( p_mi, rate * 10, &ex );
- libvlc_media_instance_destroy_and_detach( p_mi );
+ libvlc_media_instance_release( p_mi );
HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
}
int
mediacontrol_get_fullscreen( mediacontrol_Instance *self,
- mediacontrol_Exception *exception )
+ mediacontrol_Exception *exception )
{
libvlc_exception_t ex;
libvlc_media_instance_t* p_mi;
HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
i_ret = libvlc_get_fullscreen( p_mi, &ex );
- libvlc_media_instance_destroy_and_detach( p_mi );
+ libvlc_media_instance_release( p_mi );
HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
return i_ret;
void
mediacontrol_set_fullscreen( mediacontrol_Instance *self,
- const int b_fullscreen,
- mediacontrol_Exception *exception )
+ const int b_fullscreen,
+ mediacontrol_Exception *exception )
{
libvlc_exception_t ex;
libvlc_media_instance_t* p_mi;
HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
libvlc_set_fullscreen( p_mi, b_fullscreen, &ex );
- libvlc_media_instance_destroy_and_detach( p_mi );
+ libvlc_media_instance_release( p_mi );
HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
}