X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.c;h=184035cd6397a4d9101196b52bca016cacb99b1b;hb=42a0d047849f391a75432dfdf5d71523d6ec08c7;hp=c4c8d6eba697ec1b3fc2b3b4325946772c2da965;hpb=13e7023413768419047f14ce48a08075570a2125;p=vlc diff --git a/src/libvlc.c b/src/libvlc.c index c4c8d6eba6..184035cd63 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -1,7 +1,7 @@ /***************************************************************************** - * 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 @@ -35,16 +35,19 @@ /***************************************************************************** * Preamble *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include -#include -#include +#include "control/libvlc_internal.h" +#include "libvlc.h" -#include +#include -#include "audio_output.h" -#include "vlc_video.h" -#include "video_output.h" +#include +#include /***************************************************************************** * VLC_Version: return the libvlc version. @@ -71,13 +74,11 @@ DECLARE_VLC_VERSION( CompileHost, COMPILE_HOST ); 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 @@ -118,7 +119,7 @@ int VLC_Create( void ) * - 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; @@ -137,7 +138,7 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) * 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; @@ -151,13 +152,13 @@ int VLC_AddIntf( int i_object, char const *psz_module, /***************************************************************************** * 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; } @@ -183,7 +184,7 @@ int VLC_CleanUp( int i_object ) int VLC_Destroy( int i_object ) { LIBVLC_FUNC; - return libvlc_InternalDestroy( p_libvlc, i_object ? VLC_TRUE : VLC_FALSE ); + return libvlc_InternalDestroy( p_libvlc, i_object ? true : false ); } /***************************************************************************** @@ -314,9 +315,9 @@ int VLC_AddTarget( int i_object, char const *psz_target, { 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; } @@ -357,9 +358,9 @@ int VLC_Stop( int i_object ) /***************************************************************************** * 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 ) @@ -495,7 +496,7 @@ int VLC_TimeGet( int i_object ) * \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; @@ -598,7 +599,7 @@ float VLC_SpeedFaster( int i_object ) 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 ); @@ -636,7 +637,7 @@ float VLC_SpeedSlower( int i_object ) 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 ); @@ -656,6 +657,7 @@ float VLC_SpeedSlower( int i_object ) */ int VLC_PlaylistIndex( int i_object ) { + (void)i_object; printf( "This function is deprecated and should not be used anymore" ); return -1; } @@ -670,7 +672,7 @@ int VLC_PlaylistNumberOfItems( int i_object ) { 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; } @@ -707,7 +709,7 @@ int VLC_PlaylistPrev( int i_object ) 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; }