/*****************************************************************************
- * libvlc.c: main libvlc source
+ * libvlc.c: Implementation of the old libvlc API
*****************************************************************************
- * Copyright (C) 1998-2006 the VideoLAN team
+ * Copyright (C) 1998-2007 the VideoLAN team
* $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
/*****************************************************************************
* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <libvlc_internal.h>
+#include "control/libvlc_internal.h"
+#include "libvlc.h"
-#include <vlc_error.h>
+#include <vlc_playlist.h>
-#include "audio_output.h"
-#include "vlc_video.h"
-#include "video_output.h"
+#include <vlc_aout.h>
+#include <vlc_vout.h>
/*****************************************************************************
* VLC_Version: return the libvlc version.
DECLARE_VLC_VERSION( CompileDomain, COMPILE_DOMAIN );
DECLARE_VLC_VERSION( Compiler, COMPILER );
-#ifndef HAVE_SHARED_LIBVLC
extern const char psz_vlc_changeset[];
-char const * VLC_Changeset( void )
+const char* VLC_Changeset( void )
{
return psz_vlc_changeset;
}
-#endif
/*****************************************************************************
* VLC_Error: strerror() equivalent
* - message queue, module bank and playlist initialization
* - configuration and commandline parsing
*****************************************************************************/
-int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] )
+int VLC_Init( int i_object, int i_argc, const char *ppsz_argv[] )
{
int i_ret;
LIBVLC_FUNC;
* the playlist when it is completely initialised.
*****************************************************************************/
int VLC_AddIntf( int i_object, char const *psz_module,
- vlc_bool_t b_block, vlc_bool_t b_play )
+ bool b_block, bool b_play )
{
int i_ret;
LIBVLC_FUNC;
/*****************************************************************************
* VLC_Die: ask vlc to die.
*****************************************************************************
- * This function sets p_vlc->b_die to VLC_TRUE, but does not do any other
+ * This function sets p_libvlc->b_die to true, but does not do any other
* task. It is your duty to call VLC_CleanUp and VLC_Destroy afterwards.
*****************************************************************************/
int VLC_Die( int i_object )
{
LIBVLC_FUNC;
- p_libvlc->b_die = VLC_TRUE;
+ vlc_object_kill( p_libvlc );
LIBVLC_FUNC_END;
return VLC_SUCCESS;
}
int VLC_Destroy( int i_object )
{
LIBVLC_FUNC;
- return libvlc_InternalDestroy( p_libvlc, VLC_TRUE );
+ return libvlc_InternalDestroy( p_libvlc, i_object ? true : false );
}
/*****************************************************************************
{
int i_err;
LIBVLC_PLAYLIST_FUNC;
- i_err = playlist_PlaylistAddExt( p_libvlc->p_playlist, psz_target,
- psz_target, i_mode, i_pos, -1,
- ppsz_options, i_options );
+ i_err = playlist_AddExt( p_libvlc->p_playlist, psz_target,
+ NULL, i_mode, i_pos, -1,
+ ppsz_options, i_options, true, false );
LIBVLC_PLAYLIST_FUNC_END;
return i_err;
}
/*****************************************************************************
* VLC_IsPlaying: Query for Playlist Status
*****************************************************************************/
-vlc_bool_t VLC_IsPlaying( int i_object )
+bool VLC_IsPlaying( int i_object )
{
- vlc_bool_t b_playing;
+ bool b_playing;
LIBVLC_PLAYLIST_FUNC;
if( p_libvlc->p_playlist->p_input )
* \param b_relative seek relative from current position
* \return VLC_SUCCESS on success
*/
-int VLC_TimeSet( int i_object, int i_seconds, vlc_bool_t b_relative )
+int VLC_TimeSet( int i_object, int i_seconds, bool b_relative )
{
input_thread_t *p_input;
vlc_value_t val;
return VLC_ENOOBJ;
}
- val.b_bool = VLC_TRUE;
+ val.b_bool = true;
var_Set( p_input, "rate-faster", val );
var_Get( p_input, "rate", &val );
vlc_object_release( p_input );
return VLC_ENOOBJ;
}
- val.b_bool = VLC_TRUE;
+ val.b_bool = true;
var_Set( p_input, "rate-slower", val );
var_Get( p_input, "rate", &val );
vlc_object_release( p_input );
*/
int VLC_PlaylistIndex( int i_object )
{
+ (void)i_object;
printf( "This function is deprecated and should not be used anymore" );
return -1;
}
{
int i_size;
LIBVLC_PLAYLIST_FUNC;
- i_size = p_libvlc->p_playlist->i_size;
+ i_size = p_libvlc->p_playlist->items.i_size;
LIBVLC_PLAYLIST_FUNC_END;
return i_size;
}
int VLC_PlaylistClear( int i_object )
{
LIBVLC_PLAYLIST_FUNC;
- playlist_Clear( p_libvlc->p_playlist );
+ playlist_Clear( p_libvlc->p_playlist, true );
LIBVLC_PLAYLIST_FUNC_END;
return VLC_SUCCESS;
}