Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
a8b1850a
Commit
a8b1850a
authored
Dec 07, 2013
by
Rafaël Carré
Browse files
Rename main module to core
parent
15c86584
Changes
6
Hide whitespace changes
Inline
Side-by-side
src/Makefile.am
View file @
a8b1850a
...
...
@@ -163,7 +163,7 @@ EXTRA_DIST += libvlc_win32_rc.rc.in
lib_LTLIBRARIES
=
libvlccore.la
AM_CPPFLAGS
=
$(INCICONV)
$(IDN_CFLAGS)
\
-DMODULE_STRING
=
\"
main
\"
\
-DMODULE_STRING
=
\"
core
\"
\
-DLOCALEDIR
=
\"
$(localedir)
\"
\
-DPKGDATADIR
=
\"
$(vlcdatadir)
\"
\
-DPKGLIBDIR
=
\"
$(vlclibdir)
\"
...
...
src/config/help.c
View file @
a8b1850a
...
...
@@ -202,7 +202,7 @@ static void Help (vlc_object_t *p_this, char const *psz_help_name)
if
(
psz_help_name
&&
!
strcmp
(
psz_help_name
,
"help"
)
)
{
printf
(
_
(
vlc_usage
),
"vlc"
);
Usage
(
p_this
,
"=
main
"
);
Usage
(
p_this
,
"=
core
"
);
print_help_on_full_help
();
}
else
if
(
psz_help_name
&&
!
strcmp
(
psz_help_name
,
"longhelp"
)
)
...
...
src/libvlc-module.c
View file @
a8b1850a
/*****************************************************************************
* libvlc-module.c: Options for the
main
(libvlc itself) module
* libvlc-module.c: Options for the
core
(libvlc itself) module
*****************************************************************************
* Copyright (C) 1998-2009 VLC authors and VideoLAN
* $Id$
...
...
@@ -25,7 +25,7 @@
*****************************************************************************/
// Pretend we are a builtin module
#define MODULE_NAME
main
#define MODULE_NAME
core
#ifdef HAVE_CONFIG_H
# include "config.h"
...
...
@@ -47,7 +47,7 @@ static const char *const ppsz_snap_formats[] =
{
"png"
,
"jpg"
,
"tiff"
};
/*****************************************************************************
* Configuration options for the
main program
. Each module will also separatly
* Configuration options for the
core module
. Each module will also separatly
* define its own configuration options.
* Look into configuration.h if you need to know more about the following
* macros.
...
...
@@ -2696,7 +2696,7 @@ vlc_module_begin ()
/* Usage (mainly useful for cmd line stuff) */
/* add_usage_hint( PLAYLIST_USAGE ) */
set_description
(
N_
(
"
main
program"
)
)
set_description
(
N_
(
"
core
program"
)
)
vlc_module_end
()
/*****************************************************************************
...
...
src/libvlc.c
View file @
a8b1850a
...
...
@@ -137,8 +137,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
system_Init
();
/* Initialize the module bank and load the configuration of the
*
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
*
core
module. We need to do this at this stage to be able to display
* a short help if required by the user. (short help ==
core
module
* options) */
module_InitBank
();
...
...
src/modules/bank.c
View file @
a8b1850a
...
...
@@ -104,12 +104,12 @@ void module_InitBank (void)
if
(
modules
.
usage
==
0
)
{
/* Fills the module bank structure with the
main
module infos.
* This is very useful as it will allow us to consider the
main
/* Fills the module bank structure with the
core
module infos.
* This is very useful as it will allow us to consider the
core
* library just as another module, and for instance the configuration
* options of
main
will be available in the module bank structure just
* options of
core
will be available in the module bank structure just
* as for every other module. */
module_t
*
module
=
module_InitStatic
(
vlc_entry__
main
);
module_t
*
module
=
module_InitStatic
(
vlc_entry__
core
);
if
(
likely
(
module
!=
NULL
))
module_StoreBank
(
module
);
config_SortConfig
();
...
...
@@ -119,7 +119,7 @@ void module_InitBank (void)
/* We do retain the module bank lock until the plugins are loaded as well.
* This is ugly, this staged loading approach is needed: LibVLC gets
* some configuration parameters relevant to loading the plugins from
* the
main
(builtin) module. The module bank becomes shared read-only data
* the
core
(builtin) module. The module bank becomes shared read-only data
* once it is ready, so we need to fully serialize initialization.
* DO NOT UNCOMMENT the following line unless you managed to squeeze
* module_LoadPlugins() before you unlock the mutex. */
...
...
src/modules/modules.h
View file @
a8b1850a
...
...
@@ -49,8 +49,8 @@ typedef void *module_handle_t;
/** Plugin entry point prototype */
typedef
int
(
*
vlc_plugin_cb
)
(
int
(
*
)(
void
*
,
void
*
,
int
,
...),
void
*
);
/**
Main
module */
int
vlc_entry__
main
(
int
(
*
)(
void
*
,
void
*
,
int
,
...),
void
*
);
/**
Core
module */
int
vlc_entry__
core
(
int
(
*
)(
void
*
,
void
*
,
int
,
...),
void
*
);
/**
* Internal module descriptor
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment