/*****************************************************************************
* libvlc.c: main libvlc source
- * Includes the main() function for vlc. Parses command line, starts playlist
- * and spawns threads.
*****************************************************************************
- * Copyright (C) 1998-2001 VideoLAN
- * $Id: libvlc.c,v 1.8 2002/06/07 14:30:41 sam Exp $
+ * Copyright (C) 1998-2002 VideoLAN
+ * $Id: libvlc.c,v 1.25 2002/08/12 09:34:15 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
* Pretend we are a builtin module
*****************************************************************************/
#define MODULE_NAME main
+#define MODULE_PATH main
#define __BUILTIN__
/*****************************************************************************
#include "stream_control.h"
#include "input_ext-intf.h"
-#include "playlist.h"
+#include "vlc_playlist.h"
#include "interface.h"
#include "audio_output.h"
void * p_global_data;
/* A list of all the currently allocated vlc objects */
-static volatile int i_vlc = 0;
-static volatile vlc_t **pp_vlc = NULL;
+static int volatile i_vlc = 0;
+static int volatile i_unique = 0;
+static vlc_t ** volatile pp_vlc = NULL;
/*****************************************************************************
* Local prototypes
static void Usage ( vlc_t *, const char *psz_module_name );
static void ListModules ( vlc_t * );
static void Version ( void );
-static void Build ( void );
#ifndef WIN32
static void InitSignalHandler ( void );
* This function allocates a vlc_t structure and returns NULL in case of
* failure. Also, the thread system and the signal handlers are initialized.
*****************************************************************************/
-vlc_t * vlc_create( void )
+vlc_error_t vlc_create( void )
+{
+ vlc_t * p_vlc = vlc_create_r();
+ return p_vlc ? VLC_SUCCESS : VLC_EGENERIC;
+}
+
+vlc_t * vlc_create_r( void )
{
vlc_t * p_vlc = NULL;
pp_vlc = realloc( pp_vlc, (i_vlc+1) * sizeof( vlc_t * ) );
pp_vlc[ i_vlc ] = p_vlc;
i_vlc++;
+ p_vlc->i_unique = i_unique;
+ i_unique++;
vlc_mutex_unlock( p_vlc->p_global_lock );
/* Update the handle status */
* - message queue, module bank and playlist initialization
* - configuration and commandline parsing
*****************************************************************************/
-vlc_error_t vlc_init( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
+vlc_error_t vlc_init( int i_argc, char *ppsz_argv[] )
+{
+ return vlc_init_r( ( i_vlc == 1 ) ? *pp_vlc : NULL, i_argc, ppsz_argv );
+}
+
+vlc_error_t vlc_init_r( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
{
char p_capabilities[200];
- char *psz_module;
char *p_tmp;
module_t *p_help_module;
playlist_t *p_playlist;
/* Check that the handle is valid */
if( !p_vlc || p_vlc->i_status != VLC_STATUS_CREATED )
{
- fprintf( stderr, "error: invalid status\n" );
+ fprintf( stderr, "error: invalid status (!CREATED)\n" );
return VLC_ESTATUS;
}
fprintf( stderr, COPYRIGHT_MESSAGE "\n" );
/* Guess what CPU we have */
- p_vlc->i_cpu_capabilities = CPUCapabilities( p_vlc );
+ p_vlc->i_cpu = CPUCapabilities( p_vlc );
/*
* Support for gettext
}
p_help_module->psz_object_name = "help";
config_Duplicate( p_help_module, p_help_config );
- p_help_module->next = p_vlc->module_bank.first;
- p_vlc->module_bank.first = p_help_module;
+ p_help_module->next = p_vlc->p_module_bank->first;
+ p_vlc->p_module_bank->first = p_help_module;
/* End hack */
if( config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE ) )
{
- p_vlc->module_bank.first = p_help_module->next;
+ p_vlc->p_module_bank->first = p_help_module->next;
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
module_EndBank( p_vlc );
Usage( p_vlc, "help" );
Usage( p_vlc, "main" );
- p_vlc->module_bank.first = p_help_module->next;
+ p_vlc->p_module_bank->first = p_help_module->next;
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
module_EndBank( p_vlc );
if( config_GetInt( p_vlc, "version" ) )
{
Version();
- p_vlc->module_bank.first = p_help_module->next;
- config_Free( p_help_module );
- vlc_object_destroy( p_help_module );
- module_EndBank( p_vlc );
- msg_Destroy( p_vlc );
- return VLC_EEXIT;
- }
-
- /* Check for build option */
- if( config_GetInt( p_vlc, "build" ) )
- {
- Build();
- p_vlc->module_bank.first = p_help_module->next;
+ p_vlc->p_module_bank->first = p_help_module->next;
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
module_EndBank( p_vlc );
}
/* Hack: remove the help module here */
- p_vlc->module_bank.first = p_help_module->next;
+ p_vlc->p_module_bank->first = p_help_module->next;
/* End hack */
/*
module_LoadBuiltins( p_vlc );
module_LoadPlugins( p_vlc );
msg_Dbg( p_vlc, "module bank initialized, found %i modules",
- p_vlc->module_bank.i_count );
+ p_vlc->p_module_bank->i_count );
/* Hack: insert the help module here */
- p_help_module->next = p_vlc->module_bank.first;
- p_vlc->module_bank.first = p_help_module;
+ p_help_module->next = p_vlc->p_module_bank->first;
+ p_vlc->p_module_bank->first = p_help_module;
/* End hack */
/* Check for help on modules */
{
Usage( p_vlc, p_tmp );
free( p_tmp );
- p_vlc->module_bank.first = p_help_module->next;
+ p_vlc->p_module_bank->first = p_help_module->next;
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
module_EndBank( p_vlc );
if( config_GetInt( p_vlc, "longhelp" ) )
{
Usage( p_vlc, NULL );
- p_vlc->module_bank.first = p_help_module->next;
+ p_vlc->p_module_bank->first = p_help_module->next;
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
module_EndBank( p_vlc );
if( config_GetInt( p_vlc, "list" ) )
{
ListModules( p_vlc );
- p_vlc->module_bank.first = p_help_module->next;
+ p_vlc->p_module_bank->first = p_help_module->next;
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
module_EndBank( p_vlc );
}
/* Hack: remove the help module here */
- p_vlc->module_bank.first = p_help_module->next;
+ p_vlc->p_module_bank->first = p_help_module->next;
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
/* End hack */
return VLC_EGENERIC;
}
-
/*
* System specific configuration
*/
system_Configure( p_vlc );
- /* p_vlc inititalization. FIXME ? */
- p_vlc->i_desync = config_GetInt( p_vlc, "desync" ) * (mtime_t)1000;
+ /*
+ * Output messages that may still be in the queue
+ */
p_vlc->b_verbose = config_GetInt( p_vlc, "verbose" );
p_vlc->b_quiet = config_GetInt( p_vlc, "quiet" );
p_vlc->b_color = config_GetInt( p_vlc, "color" );
+ msg_Flush( p_vlc );
+
+ /* p_vlc inititalization. FIXME ? */
+ p_vlc->i_desync = config_GetInt( p_vlc, "desync" ) * (mtime_t)1000;
+#if defined( __i386__ )
if( !config_GetInt( p_vlc, "mmx" ) )
- p_vlc->i_cpu_capabilities &= ~CPU_CAPABILITY_MMX;
+ p_vlc->i_cpu &= ~CPU_CAPABILITY_MMX;
if( !config_GetInt( p_vlc, "3dn" ) )
- p_vlc->i_cpu_capabilities &= ~CPU_CAPABILITY_3DNOW;
+ p_vlc->i_cpu &= ~CPU_CAPABILITY_3DNOW;
if( !config_GetInt( p_vlc, "mmxext" ) )
- p_vlc->i_cpu_capabilities &= ~CPU_CAPABILITY_MMXEXT;
+ p_vlc->i_cpu &= ~CPU_CAPABILITY_MMXEXT;
if( !config_GetInt( p_vlc, "sse" ) )
- p_vlc->i_cpu_capabilities &= ~CPU_CAPABILITY_SSE;
+ p_vlc->i_cpu &= ~CPU_CAPABILITY_SSE;
+#endif
+#if defined( __powerpc__ ) || defined( SYS_DARWIN )
if( !config_GetInt( p_vlc, "altivec" ) )
- p_vlc->i_cpu_capabilities &= ~CPU_CAPABILITY_ALTIVEC;
+ p_vlc->i_cpu &= ~CPU_CAPABILITY_ALTIVEC;
+#endif
#define PRINT_CAPABILITY( capability, string ) \
- if( p_vlc->i_cpu_capabilities & capability ) \
+ if( p_vlc->i_cpu & capability ) \
{ \
strncat( p_capabilities, string " ", \
sizeof(p_capabilities) - strlen(p_capabilities) ); \
/*
* Choose the best memcpy module
*/
- psz_module = config_GetPsz( p_vlc, "memcpy" );
- p_vlc->p_memcpy_module =
- module_Need( p_vlc, MODULE_CAPABILITY_MEMCPY, psz_module, NULL );
- if( psz_module ) free( psz_module );
- if( p_vlc->p_memcpy_module == NULL )
+ p_vlc->p_memcpy_module = module_Need( p_vlc, "memcpy", "$memcpy" );
+
+ if( p_vlc->pf_memcpy == NULL )
{
- msg_Err( p_vlc, "no suitable memcpy module, using libc default" );
p_vlc->pf_memcpy = memcpy;
}
- else
+
+ if( p_vlc->pf_memset == NULL )
{
- p_vlc->pf_memcpy = p_vlc->p_memcpy_module->p_functions
- ->memcpy.functions.memcpy.pf_memcpy;
+ p_vlc->pf_memset = memset;
}
/*
&& network_ChannelCreate( p_vlc ) )
{
/* On error during Channels initialization, switch off channels */
- msg_Err( p_vlc,
- "channels initialization failed, deactivating channels" );
+ msg_Warn( p_vlc,
+ "channels initialization failed, deactivating channels" );
config_PutInt( p_vlc, "network-channel", VLC_FALSE );
}
- /* Update the handle status */
- p_vlc->i_status = VLC_STATUS_STOPPED;
-
-/* XXX XXX XXX XXX XXX XXX XXX XXX */
-/* XXX XXX XXX XXX XXX XXX XXX XXX */
-/* XXX XXX XXX XXX XXX XXX XXX XXX */
/*
* Initialize playlist and get commandline files
*/
if( !p_playlist )
{
msg_Err( p_vlc, "playlist initialization failed" );
+ if( p_vlc->p_memcpy_module != NULL )
+ {
+ module_Unneed( p_vlc, p_vlc->p_memcpy_module );
+ }
module_EndBank( p_vlc );
msg_Destroy( p_vlc );
return VLC_EGENERIC;
}
+ /* Update the handle status */
+ p_vlc->i_status = VLC_STATUS_STOPPED;
+
/*
* Get input filenames given as commandline arguments
*/
GetFilenames( p_vlc, i_argc, ppsz_argv );
-/* XXX XXX XXX XXX XXX XXX XXX XXX */
-/* XXX XXX XXX XXX XXX XXX XXX XXX */
-/* XXX XXX XXX XXX XXX XXX XXX XXX */
return VLC_SUCCESS;
}
* separate thread. If b_block is set to 1, vlc_add_intf will continue until
* user requests to quit.
*****************************************************************************/
-vlc_error_t vlc_run( vlc_t *p_vlc )
+vlc_error_t vlc_run( void )
+{
+ return vlc_run_r( ( i_vlc == 1 ) ? *pp_vlc : NULL );
+}
+
+vlc_error_t vlc_run_r( vlc_t *p_vlc )
{
/* Check that the handle is valid */
if( !p_vlc || p_vlc->i_status != VLC_STATUS_STOPPED )
{
- fprintf( stderr, "error: invalid status\n" );
+ fprintf( stderr, "error: invalid status (!STOPPED)\n" );
return VLC_ESTATUS;
}
* separate thread. If b_block is set to 1, vlc_add_intf will continue until
* user requests to quit.
*****************************************************************************/
-vlc_error_t vlc_add_intf( vlc_t *p_vlc, char *psz_module, vlc_bool_t b_block )
+vlc_error_t vlc_add_intf( const char *psz_module, vlc_bool_t b_block )
+{
+ return vlc_add_intf_r( ( i_vlc == 1 ) ? *pp_vlc : NULL,
+ psz_module, b_block );
+}
+
+vlc_error_t vlc_add_intf_r( vlc_t *p_vlc, const char *psz_module,
+ vlc_bool_t b_block )
{
vlc_error_t err;
intf_thread_t *p_intf;
/* Check that the handle is valid */
if( !p_vlc || p_vlc->i_status != VLC_STATUS_RUNNING )
{
- fprintf( stderr, "error: invalid status\n" );
+ fprintf( stderr, "error: invalid status (!RUNNING)\n" );
return VLC_ESTATUS;
}
err = intf_RunThread( p_intf );
if( err )
{
+ vlc_object_detach( p_intf );
intf_Destroy( p_intf );
return err;
}
* This function requests the interface threads to finish, waits for their
* termination, and destroys their structure.
*****************************************************************************/
-vlc_error_t vlc_stop( vlc_t *p_vlc )
+vlc_error_t vlc_stop( void )
+{
+ return vlc_stop_r( ( i_vlc == 1 ) ? *pp_vlc : NULL );
+}
+
+vlc_error_t vlc_stop_r( vlc_t *p_vlc )
{
intf_thread_t *p_intf;
playlist_t *p_playlist;
vout_thread_t *p_vout;
- aout_thread_t *p_aout;
+ aout_instance_t *p_aout;
/* Check that the handle is valid */
if( !p_vlc || p_vlc->i_status != VLC_STATUS_RUNNING )
{
- fprintf( stderr, "error: invalid status\n" );
+ fprintf( stderr, "error: invalid status (!RUNNING)\n" );
return VLC_ESTATUS;
}
while( (p_intf = vlc_object_find( p_vlc, VLC_OBJECT_INTF, FIND_CHILD )) )
{
intf_StopThread( p_intf );
- vlc_object_detach_all( p_intf );
+ vlc_object_detach( p_intf );
vlc_object_release( p_intf );
intf_Destroy( p_intf );
}
while( (p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST,
FIND_CHILD )) )
{
- vlc_object_detach_all( p_playlist );
+ vlc_object_detach( p_playlist );
vlc_object_release( p_playlist );
playlist_Destroy( p_playlist );
}
msg_Dbg( p_vlc, "removing all video outputs" );
while( (p_vout = vlc_object_find( p_vlc, VLC_OBJECT_VOUT, FIND_CHILD )) )
{
- vlc_object_detach_all( p_vout );
+ vlc_object_detach( p_vout );
vlc_object_release( p_vout );
vout_DestroyThread( p_vout );
}
msg_Dbg( p_vlc, "removing all audio outputs" );
while( (p_aout = vlc_object_find( p_vlc, VLC_OBJECT_AOUT, FIND_CHILD )) )
{
- vlc_object_detach_all( p_aout );
- vlc_object_release( p_aout );
- aout_DestroyThread( p_aout );
+ vlc_object_detach( (vlc_object_t *)p_aout );
+ vlc_object_release( (vlc_object_t *)p_aout );
+ aout_DeleteInstance( p_aout );
}
/* Update the handle status */
* This function uninitializes every vlc component that was activated in
* vlc_init: audio and video outputs, playlist, module bank and message queue.
*****************************************************************************/
-vlc_error_t vlc_end( vlc_t *p_vlc )
+vlc_error_t vlc_end( void )
+{
+ return vlc_end_r( ( i_vlc == 1 ) ? *pp_vlc : NULL );
+}
+
+vlc_error_t vlc_end_r( vlc_t *p_vlc )
{
/* Check that the handle is valid */
if( !p_vlc || p_vlc->i_status != VLC_STATUS_STOPPED )
{
- fprintf( stderr, "error: invalid status\n" );
+ fprintf( stderr, "error: invalid status (!STOPPED)\n" );
return VLC_ESTATUS;
}
*/
if( p_vlc->p_memcpy_module != NULL )
{
- module_Unneed( p_vlc->p_memcpy_module );
+ module_Unneed( p_vlc, p_vlc->p_memcpy_module );
}
free( p_vlc->psz_homedir );
*****************************************************************************
* This function frees the previously allocated vlc_t structure.
*****************************************************************************/
-vlc_error_t vlc_destroy( vlc_t *p_vlc )
+vlc_error_t vlc_destroy( void )
+{
+ return vlc_destroy_r( ( i_vlc == 1 ) ? *pp_vlc : NULL );
+}
+
+vlc_error_t vlc_destroy_r( vlc_t *p_vlc )
{
int i_index;
/* Check that the handle is valid */
if( !p_vlc || p_vlc->i_status != VLC_STATUS_CREATED )
{
- fprintf( stderr, "error: invalid status\n" );
+ fprintf( stderr, "error: invalid status (!CREATED)\n" );
return VLC_ESTATUS;
}
if( i_index == i_vlc )
{
fprintf( stderr, "error: trying to unregister %p which is not in "
- "the list\n", p_vlc );
+ "the list\n", (void *)p_vlc );
vlc_mutex_unlock( p_vlc->p_global_lock );
vlc_object_destroy( p_vlc );
return VLC_EGENERIC;
}
vlc_mutex_unlock( p_vlc->p_global_lock );
- /* Stop thread system FIXME: last one out please shut the door! */
- //vlc_threads_end( );
+ /* Stop thread system: last one out please shut the door! */
+ vlc_threads_end( p_vlc );
/* Destroy mutexes */
vlc_mutex_destroy( &p_vlc->structure_lock );
return VLC_SUCCESS;
}
-vlc_status_t vlc_status( vlc_t *p_vlc )
+vlc_status_t vlc_status( void )
+{
+ return vlc_status_r( ( i_vlc == 1 ) ? *pp_vlc : NULL );
+}
+
+vlc_status_t vlc_status_r( vlc_t *p_vlc )
{
if( !p_vlc )
{
return p_vlc->i_status;
}
-vlc_error_t vlc_add_target( vlc_t *p_vlc, char *psz_target,
- int i_mode, int i_pos )
+vlc_error_t vlc_add_target( const char *psz_target, int i_mode, int i_pos )
+{
+ return vlc_add_target_r( ( i_vlc == 1 ) ? *pp_vlc : NULL,
+ psz_target, i_mode, i_pos );
+}
+
+vlc_error_t vlc_add_target_r( vlc_t *p_vlc, const char *psz_target,
+ int i_mode, int i_pos )
{
vlc_error_t err;
playlist_t *p_playlist;
if( !p_vlc || ( p_vlc->i_status != VLC_STATUS_STOPPED
&& p_vlc->i_status != VLC_STATUS_RUNNING ) )
{
- fprintf( stderr, "error: invalid status\n" );
+ fprintf( stderr, "error: invalid status (!STOPPED&&!RUNNING)\n" );
return VLC_ESTATUS;
}
/* We assume that the remaining parameters are filenames */
for( i_opt = optind; i_opt < i_argc; i_opt++ )
{
- vlc_add_target( p_vlc, ppsz_argv[ i_opt ],
- PLAYLIST_APPEND, PLAYLIST_END );
+ vlc_add_target_r( p_vlc, ppsz_argv[ i_opt ],
+ PLAYLIST_APPEND, PLAYLIST_END );
}
return VLC_SUCCESS;
#endif
/* Enumerate the config for each module */
- for( p_module = p_this->p_vlc->module_bank.first ;
+ for( p_module = p_this->p_vlc->p_module_bank->first ;
p_module != NULL ;
p_module = p_module->next )
{
p_module->psz_object_name );
for( p_item = p_module->p_config;
- p_item->i_type != MODULE_CONFIG_HINT_END;
+ p_item->i_type != CONFIG_HINT_END;
p_item++ )
{
char *psz_bra = NULL, *psz_type = NULL, *psz_ket = NULL;
switch( p_item->i_type )
{
- case MODULE_CONFIG_HINT_CATEGORY:
+ case CONFIG_HINT_CATEGORY:
+ case CONFIG_HINT_USAGE:
fprintf( stderr, " %s\n", p_item->psz_text );
break;
- case MODULE_CONFIG_ITEM_STRING:
- case MODULE_CONFIG_ITEM_FILE:
- case MODULE_CONFIG_ITEM_MODULE: /* We could also have "=<" here */
- psz_bra = " <"; psz_type = _("string"); psz_ket = ">";
- break;
- case MODULE_CONFIG_ITEM_INTEGER:
+ case CONFIG_ITEM_STRING:
+ case CONFIG_ITEM_FILE:
+ case CONFIG_ITEM_MODULE: /* We could also have "=<" here */
+ if( !p_item->ppsz_list )
+ {
+ psz_bra = " <"; psz_type = _("string"); psz_ket = ">";
+ break;
+ }
+ else
+ {
+ psz_bra = " [";
+ psz_type = malloc( 1000 );
+ memset( psz_type, 0, 1000 );
+ for( i=0; p_item->ppsz_list[i]; i++ )
+ {
+ strcat( psz_type, p_item->ppsz_list[i] );
+ strcat( psz_type, "|" );
+ }
+ psz_type[ strlen( psz_type ) - 1 ] = '\0';
+ psz_ket = "]";
+ break;
+ }
+ case CONFIG_ITEM_INTEGER:
psz_bra = " <"; psz_type = _("integer"); psz_ket = ">";
break;
- case MODULE_CONFIG_ITEM_FLOAT:
+ case CONFIG_ITEM_FLOAT:
psz_bra = " <"; psz_type = _("float"); psz_ket = ">";
break;
- case MODULE_CONFIG_ITEM_BOOL:
+ case CONFIG_ITEM_BOOL:
psz_bra = ""; psz_type = ""; psz_ket = "";
if( !b_help_module )
{
i = PADDING_SPACES - strlen( p_item->psz_name )
- strlen( psz_bra ) - strlen( psz_type )
- strlen( psz_ket ) - 1;
- if( p_item->i_type == MODULE_CONFIG_ITEM_BOOL
+ if( p_item->i_type == CONFIG_ITEM_BOOL
&& !b_help_module )
{
vlc_bool_t b_dash = VLC_FALSE;
psz_spaces[i] = '\0';
}
- if( p_item->i_type == MODULE_CONFIG_ITEM_BOOL &&
+ if( p_item->i_type == CONFIG_ITEM_BOOL &&
!b_help_module )
{
fprintf( stderr, psz_format, p_item->psz_name, psz_prefix,
p_item->psz_text, psz_suf );
}
psz_spaces[i] = ' ';
+ if ( p_item->ppsz_list )
+ {
+ free( psz_type );
+ }
}
}
- /* Yet another nasty hack.
- * Maybe we could use MODULE_CONFIG_ITEM_END to display tail messages
- * for each module?? */
- if( !strcmp( "main", p_module->psz_object_name ) )
- {
- fprintf( stderr, _("\nPlaylist items:"
- "\n *.mpg, *.vob plain MPEG-1/2 files"
- "\n [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]"
- "\n DVD device"
- "\n [vcd:][device][@[title][,[chapter]]"
- "\n VCD device"
- "\n udpstream:[@[<bind address>][:<bind port>]]"
- "\n UDP stream sent by VLS"
- "\n vlc:loop loop execution of the "
- "playlist"
- "\n vlc:pause pause execution of "
- "playlist items"
- "\n vlc:quit quit VLC"
- "\n") );
- }
-
fprintf( stderr, "\n" );
}
fprintf( stderr, _("[module] [description]\n") );
/* Enumerate each module */
- for( p_module = p_this->p_vlc->module_bank.first ;
+ for( p_module = p_this->p_vlc->p_module_bank->first ;
p_module != NULL ;
p_module = p_module->next )
{
#endif
}
-/*****************************************************************************
- * Build: print information about the vlc build
- *****************************************************************************
- * Print the ./configure command line and other information.
- *****************************************************************************/
-static void Build( void )
-{
-#ifdef WIN32
- ShowConsole();
-#endif
-
- fprintf( stderr, "configured with %s\n", CONFIGURE_LINE );
-
-#ifdef WIN32 /* Pause the console because it's destroyed when we exit */
- fprintf( stderr, _("\nPress the RETURN key to continue...\n") );
- getchar();
-#endif
-}
-
/*****************************************************************************
* ShowConsole: On Win32, create an output console for debug messages
*****************************************************************************
* armed and following signals will be ignored to avoid sending messages
* to an interface having been destroyed */
- vlc_mutex_lock( &global_lock );
if( !b_die )
{
b_die = VLC_TRUE;
abort_time = mdate();
+ fprintf( stderr, "signal %d received, terminating libvlc - do it "
+ "again in case your process gets stuck\n", i_signal );
+
/* Try to terminate everything - this is done by requesting the end of
* all the p_vlc structures */
for( i_index = 0 ; i_index < i_vlc ; i_index++ )
{
/* Acknowledge the signal received */
- msg_Err( pp_vlc[ i_index ], "signal %d received, exiting - do it "
- "again in case vlc gets stuck", i_signal );
pp_vlc[ i_index ]->b_die = VLC_TRUE;
}
}
signal( SIGHUP, SIG_IGN );
signal( SIGQUIT, SIG_IGN );
- for( i_index = 0 ; i_index < i_vlc ; i_index++ )
- {
- msg_Err( pp_vlc[ i_index ], "user insisted too much, dying badly" );
- }
+ fprintf( stderr, "user insisted too much, dying badly\n" );
- vlc_mutex_unlock( &global_lock );
exit( 1 );
}
-
- vlc_mutex_unlock( &global_lock );
}
#endif
projects / vlc / blobdiff