* libvlc.c: main libvlc source
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.c,v 1.88 2003/05/25 17:27:13 massiot Exp $
+ * $Id: libvlc.c,v 1.93 2003/07/19 14:22:08 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
#include "vlc_cpu.h" /* CPU detection */
#include "os_specific.h"
-#include "error.h"
+#include "vlc_error.h"
#include "stream_control.h"
#include "input_ext-intf.h"
#include "vlc_playlist.h"
-#include "interface.h"
+#include "vlc_interface.h"
#include "audio_output.h"
-#include "video.h"
+#include "vlc_video.h"
#include "video_output.h"
#include "libvlc.h"
/*****************************************************************************
* The evil global variable. We handle it with care, don't worry.
*****************************************************************************/
-static libvlc_t libvlc;
-static vlc_t * p_static_vlc;
+static libvlc_t libvlc;
+static libvlc_t * p_libvlc;
+static vlc_t * p_static_vlc;
/*****************************************************************************
* Local prototypes
vlc_t * p_vlc = NULL;
vlc_value_t lockval;
+ /* &libvlc never changes, so we can safely call this multiple times. */
+ p_libvlc = &libvlc;
+
/* vlc_threads_init *must* be the first internal call! No other call is
* allowed before the thread system has been initialized. */
- i_ret = vlc_threads_init( &libvlc );
+ i_ret = vlc_threads_init( p_libvlc );
if( i_ret < 0 )
{
return i_ret;
/* Now that the thread system is initialized, we don't have much, but
* at least we have var_Create */
- var_Create( &libvlc, "libvlc", VLC_VAR_MUTEX );
- var_Get( &libvlc, "libvlc", &lockval );
+ var_Create( p_libvlc, "libvlc", VLC_VAR_MUTEX );
+ var_Get( p_libvlc, "libvlc", &lockval );
vlc_mutex_lock( lockval.p_address );
if( !libvlc.b_ready )
{
#endif
/* Initialize message queue */
- msg_Create( &libvlc );
+ msg_Create( p_libvlc );
/* Announce who we are */
- msg_Dbg( &libvlc, COPYRIGHT_MESSAGE );
- msg_Dbg( &libvlc, "libvlc was configured with %s", CONFIGURE_LINE );
+ msg_Dbg( p_libvlc, COPYRIGHT_MESSAGE );
+ msg_Dbg( p_libvlc, "libvlc was configured with %s", CONFIGURE_LINE );
/* The module bank will be initialized later */
libvlc.p_module_bank = NULL;
libvlc.b_ready = VLC_TRUE;
}
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( &libvlc, "libvlc" );
+ var_Destroy( p_libvlc, "libvlc" );
/* Allocate a vlc object */
- p_vlc = vlc_object_create( &libvlc, VLC_OBJECT_VLC );
+ p_vlc = vlc_object_create( p_libvlc, VLC_OBJECT_VLC );
if( p_vlc == NULL )
{
return VLC_EGENERIC;
#endif
/* Store our newly allocated structure in the global list */
- vlc_object_attach( p_vlc, &libvlc );
+ vlc_object_attach( p_vlc, p_libvlc );
/* Store data for the non-reentrant API */
p_static_vlc = p_vlc;
playlist_t *p_playlist;
vlc_value_t lockval;
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
if( !p_vlc )
{
* main module. We need to do this at this stage to be able to display
* a short help if required by the user. (short help == main module
* options) */
- var_Create( &libvlc, "libvlc", VLC_VAR_MUTEX );
- var_Get( &libvlc, "libvlc", &lockval );
+ var_Create( p_libvlc, "libvlc", VLC_VAR_MUTEX );
+ var_Get( p_libvlc, "libvlc", &lockval );
vlc_mutex_lock( lockval.p_address );
if( libvlc.p_module_bank == NULL )
{
- module_InitBank( &libvlc );
- module_LoadMain( &libvlc );
+ module_InitBank( p_libvlc );
+ module_LoadMain( p_libvlc );
}
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( &libvlc, "libvlc" );
+ var_Destroy( p_libvlc, "libvlc" );
/* Hack: insert the help module here */
p_help_module = vlc_object_create( p_vlc, VLC_OBJECT_MODULE );
textdomain( PACKAGE );
-#if defined( SYS_BEOS ) || defined ( SYS_DARWIN )
+#if defined( SYS_BEOS ) || defined ( SYS_DARWIN ) || \
+ ( defined( WIN32 ) && !defined( HAVE_INCLUDED_GETTEXT ) )
/* BeOS only support UTF8 strings */
/* Mac OS X prefers UTF8 */
bind_textdomain_codeset( PACKAGE, "UTF-8" );
#endif
module_EndBank( p_vlc );
- module_InitBank( &libvlc );
- module_LoadMain( &libvlc );
+ module_InitBank( p_libvlc );
+ module_LoadMain( p_libvlc );
config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE );
}
if( psz_language ) free( psz_language );
* list of configuration options exported by each module and loads their
* default values.
*/
- module_LoadBuiltins( &libvlc );
- module_LoadPlugins( &libvlc );
+ module_LoadBuiltins( p_libvlc );
+ module_LoadPlugins( p_libvlc );
msg_Dbg( p_vlc, "module bank initialized, found %i modules",
libvlc.p_module_bank->i_children );
intf_thread_t *p_intf;
vlc_t *p_vlc;
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
if( !p_vlc )
{
{
vlc_t *p_vlc;
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
if( !p_vlc )
{
vlc_object_destroy( p_vlc );
/* Stop thread system: last one out please shut the door! */
- vlc_threads_end( &libvlc );
+ vlc_threads_end( p_libvlc );
return VLC_SUCCESS;
}
{
vlc_t *p_vlc;
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
if( !p_vlc )
{
playlist_t *p_playlist;
vlc_t *p_vlc;
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
if( !p_vlc )
{
vlc_t *p_vlc;
int i_ret;
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
if( !p_vlc )
{
vlc_t *p_vlc;
int i_ret;
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
if( !p_vlc )
{
playlist_t * p_playlist;
vlc_t *p_vlc;
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
/* Check that the handle is valid */
if( !p_vlc )
aout_instance_t * p_aout;
vlc_t *p_vlc;
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
/* Check that the handle is valid */
if( !p_vlc )
input_thread_t *p_input;
vlc_t *p_vlc;
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
if( !p_vlc )
{
vout_thread_t *p_vout;
vlc_t *p_vlc;
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
if( !p_vlc )
{
char psz_tmp[1024];
#endif
-# if defined( HAVE_INCLUDED_GETTEXT ) && !defined( HAVE_LC_MESSAGES )
- if( *psz_lang )
- {
- /* We set LC_ALL manually because it is the only way to set
- * the language at runtime under eg. Windows. Beware that this
- * makes the environment unconsistent when libvlc is unloaded and
- * should probably be moved to a safer place like vlc.c. */
- static char psz_lcall[20];
- snprintf( psz_lcall, 19, "LC_ALL=%s", psz_lang );
- psz_lcall[19] = '\0';
- putenv( psz_lcall );
- }
-# endif
-
if( psz_lang && !*psz_lang )
{
# if defined( HAVE_LC_MESSAGES )
# endif
setlocale( LC_CTYPE, psz_lang );
}
- else
+ else if( psz_lang )
{
-#ifdef SYS_BEOS
- static char psz_lcall[20];
-#endif
- setlocale( LC_ALL, psz_lang );
#ifdef SYS_DARWIN
/* I need that under Darwin, please check it doesn't disturb
* other platforms. --Meuuh */
setenv( "LANG", psz_lang, 1 );
-#endif
-#ifdef SYS_BEOS
- /* I need this under BeOS... */
+
+#elif defined( SYS_BEOS ) || defined( WIN32 )
+ /* We set LC_ALL manually because it is the only way to set
+ * the language at runtime under eg. Windows. Beware that this
+ * makes the environment unconsistent when libvlc is unloaded and
+ * should probably be moved to a safer place like vlc.c. */
+ static char psz_lcall[20];
snprintf( psz_lcall, 19, "LC_ALL=%s", psz_lang );
psz_lcall[19] = '\0';
putenv( psz_lcall );
#endif
+
+ setlocale( LC_ALL, psz_lang );
}
/* Specify where to find the locales for current domain */
/* Set the default domain */
textdomain( PACKAGE );
-#if defined( SYS_BEOS ) || defined ( SYS_DARWIN )
+#if defined( SYS_BEOS ) || defined ( SYS_DARWIN ) || \
+ ( defined( WIN32 ) && !defined( HAVE_INCLUDED_GETTEXT ) )
/* BeOS only support UTF8 strings */
/* Mac OS X prefers UTF8 */
bind_textdomain_codeset( PACKAGE, "UTF-8" );
projects / vlc / blobdiff