Commit 17853c53 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Rename libvlc.h to libvlc-module.c

It made little sense to have an header that can only be included
in a single file.
Re-use libvlc.h for generic libvlc internal declarations.
parent a5ed35c9
...@@ -236,6 +236,7 @@ SOURCES_libvlc_common = \ ...@@ -236,6 +236,7 @@ SOURCES_libvlc_common = \
libvlc.c \ libvlc.c \
libvlc-common.c \ libvlc-common.c \
libvlc.h \ libvlc.h \
libvlc-module.c \
interface/interface.h \ interface/interface.h \
interface/interface.c \ interface/interface.c \
interface/intf_eject.c \ interface/intf_eject.c \
......
...@@ -29,13 +29,6 @@ ...@@ -29,13 +29,6 @@
* This file contains functions to create and destroy libvlc instances * This file contains functions to create and destroy libvlc instances
*/ */
/*****************************************************************************
* Pretend we are a builtin module
*****************************************************************************/
#define MODULE_NAME main
#define MODULE_PATH main
#define __BUILTIN__
/***************************************************************************** /*****************************************************************************
* Preamble * Preamble
*****************************************************************************/ *****************************************************************************/
...@@ -338,8 +331,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) ...@@ -338,8 +331,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] )
} }
p_help_module->psz_object_name = "help"; p_help_module->psz_object_name = "help";
p_help_module->psz_longname = N_("Help options"); p_help_module->psz_longname = N_("Help options");
config_Duplicate( p_help_module, p_help_config, config_Duplicate( p_help_module, libvlc_config, libvlc_config_count );
sizeof (p_help_config) / sizeof (p_help_config[0]) );
vlc_object_attach( p_help_module, libvlc_global.p_module_bank ); vlc_object_attach( p_help_module, libvlc_global.p_module_bank );
/* End hack */ /* End hack */
...@@ -866,9 +858,9 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) ...@@ -866,9 +858,9 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] )
* Initialize hotkey handling * Initialize hotkey handling
*/ */
var_Create( p_libvlc, "key-pressed", VLC_VAR_INTEGER ); var_Create( p_libvlc, "key-pressed", VLC_VAR_INTEGER );
p_libvlc->p_hotkeys = malloc( sizeof(p_hotkeys) ); p_libvlc->p_hotkeys = malloc( libvlc_hotkeys_size );
/* Do a copy (we don't need to modify the strings) */ /* Do a copy (we don't need to modify the strings) */
memcpy( p_libvlc->p_hotkeys, p_hotkeys, sizeof(p_hotkeys) ); memcpy( p_libvlc->p_hotkeys, libvlc_hotkeys, libvlc_hotkeys_size );
/* Initialize playlist and get commandline files */ /* Initialize playlist and get commandline files */
playlist_ThreadCreate( p_libvlc ); playlist_ThreadCreate( p_libvlc );
...@@ -1306,13 +1298,13 @@ static void Help( libvlc_int_t *p_this, char const *psz_help_name ) ...@@ -1306,13 +1298,13 @@ static void Help( libvlc_int_t *p_this, char const *psz_help_name )
if( psz_help_name && !strcmp( psz_help_name, "help" ) ) if( psz_help_name && !strcmp( psz_help_name, "help" ) )
{ {
utf8_fprintf( stdout, VLC_USAGE, p_this->psz_object_name ); utf8_fprintf( stdout, vlc_usage, p_this->psz_object_name );
Usage( p_this, "help" ); Usage( p_this, "help" );
Usage( p_this, "main" ); Usage( p_this, "main" );
} }
else if( psz_help_name && !strcmp( psz_help_name, "longhelp" ) ) else if( psz_help_name && !strcmp( psz_help_name, "longhelp" ) )
{ {
utf8_fprintf( stdout, VLC_USAGE, p_this->psz_object_name ); utf8_fprintf( stdout, vlc_usage, p_this->psz_object_name );
Usage( p_this, NULL ); Usage( p_this, NULL );
} }
else if( psz_help_name ) else if( psz_help_name )
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment