Commit a29a4e2e authored by Clément Stenac's avatar Clément Stenac

Did I loose the count ?

parent 105e1851
...@@ -229,6 +229,8 @@ VLC_EXPORT( module_t *, config_FindModule,( vlc_object_t *, const char * ) ); ...@@ -229,6 +229,8 @@ VLC_EXPORT( module_t *, config_FindModule,( vlc_object_t *, const char * ) );
VLC_EXPORT( int, config_Duplicate,( module_t *, const module_config_t *, size_t )); VLC_EXPORT( int, config_Duplicate,( module_t *, const module_config_t *, size_t ));
VLC_EXPORT(const char *, config_GetDataDir, ( const vlc_object_t * ));
#define config_GetType(a,b) __config_GetType(VLC_OBJECT(a),b) #define config_GetType(a,b) __config_GetType(VLC_OBJECT(a),b)
#define config_GetInt(a,b) __config_GetInt(VLC_OBJECT(a),b) #define config_GetInt(a,b) __config_GetInt(VLC_OBJECT(a),b)
#define config_PutInt(a,b,c) __config_PutInt(VLC_OBJECT(a),b,c) #define config_PutInt(a,b,c) __config_PutInt(VLC_OBJECT(a),b,c)
......
...@@ -452,6 +452,7 @@ struct module_symbols_t ...@@ -452,6 +452,7 @@ struct module_symbols_t
int (*vout_Snapshot_inner) (vout_thread_t *p_vout, picture_t *p_pic); int (*vout_Snapshot_inner) (vout_thread_t *p_vout, picture_t *p_pic);
void (*streaming_GuiDescToChain_inner) (vlc_object_t*, sout_chain_t*, sout_gui_descr_t*); void (*streaming_GuiDescToChain_inner) (vlc_object_t*, sout_chain_t*, sout_gui_descr_t*);
input_item_t* (*input_GetItem_inner) (input_thread_t*); input_item_t* (*input_GetItem_inner) (input_thread_t*);
const char * (*config_GetDataDir_inner) (const vlc_object_t *);
}; };
# if defined (__PLUGIN__) # if defined (__PLUGIN__)
# define aout_OutputNextBuffer (p_symbols)->aout_OutputNextBuffer_inner # define aout_OutputNextBuffer (p_symbols)->aout_OutputNextBuffer_inner
...@@ -887,6 +888,7 @@ struct module_symbols_t ...@@ -887,6 +888,7 @@ struct module_symbols_t
# define vout_Snapshot (p_symbols)->vout_Snapshot_inner # define vout_Snapshot (p_symbols)->vout_Snapshot_inner
# define streaming_GuiDescToChain (p_symbols)->streaming_GuiDescToChain_inner # define streaming_GuiDescToChain (p_symbols)->streaming_GuiDescToChain_inner
# define input_GetItem (p_symbols)->input_GetItem_inner # define input_GetItem (p_symbols)->input_GetItem_inner
# define config_GetDataDir (p_symbols)->config_GetDataDir_inner
# elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__) # elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
/****************************************************************** /******************************************************************
* STORE_SYMBOLS: store VLC APIs into p_symbols for plugin access. * STORE_SYMBOLS: store VLC APIs into p_symbols for plugin access.
...@@ -1325,6 +1327,7 @@ struct module_symbols_t ...@@ -1325,6 +1327,7 @@ struct module_symbols_t
((p_symbols)->vout_Snapshot_inner) = vout_Snapshot; \ ((p_symbols)->vout_Snapshot_inner) = vout_Snapshot; \
((p_symbols)->streaming_GuiDescToChain_inner) = streaming_GuiDescToChain; \ ((p_symbols)->streaming_GuiDescToChain_inner) = streaming_GuiDescToChain; \
((p_symbols)->input_GetItem_inner) = input_GetItem; \ ((p_symbols)->input_GetItem_inner) = input_GetItem; \
((p_symbols)->config_GetDataDir_inner) = config_GetDataDir; \
# endif /* __PLUGIN__ */ # endif /* __PLUGIN__ */
#endif /* __VLC_SYMBOLS_H */ #endif /* __VLC_SYMBOLS_H */
...@@ -31,7 +31,8 @@ ...@@ -31,7 +31,8 @@
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc_interface.h> #include <vlc_interface.h>
#include <<vlc_input.h>> #include <vlc_input.h>
#include <vlc_access.h>
#include "vlc_keys.h" #include "vlc_keys.h"
#include <cdio/cdio.h> #include <cdio/cdio.h>
......
...@@ -29,7 +29,8 @@ ...@@ -29,7 +29,8 @@
#include <string.h> #include <string.h>
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <<vlc_input.h>> #include <vlc_input.h>
#include <vlc_access.h>
#include <vlc_interface.h> #include <vlc_interface.h>
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
......
...@@ -21,6 +21,9 @@ ...@@ -21,6 +21,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#include <vlc/vlc.h>
#include <vlc_input.h>
/***************************************************************************** /*****************************************************************************
* intf_sys_t: description and status of interface * intf_sys_t: description and status of interface
*****************************************************************************/ *****************************************************************************/
......
...@@ -28,7 +28,9 @@ ...@@ -28,7 +28,9 @@
#include <string.h> #include <string.h>
#include <xosd.h> #include <xosd.h>
#include <vlc/vlc.h>
#include <vlc_playlist.h>
#include <vlc_item.h>
#include <vlc_interface.h> #include <vlc_interface.h>
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
......
...@@ -14,5 +14,4 @@ void config_UnsetCallbacks ( module_config_t *, size_t ); ...@@ -14,5 +14,4 @@ void config_UnsetCallbacks ( module_config_t *, size_t );
int __config_LoadCmdLine ( vlc_object_t *, int *, char *[], vlc_bool_t ); int __config_LoadCmdLine ( vlc_object_t *, int *, char *[], vlc_bool_t );
char * config_GetHomeDir ( void ); char * config_GetHomeDir ( void );
char * config_GetUserDir ( void ); char * config_GetUserDir ( void );
const char * config_GetDataDir ( const vlc_object_t * );
int __config_LoadConfigFile ( vlc_object_t *, const char * ); int __config_LoadConfigFile ( vlc_object_t *, const char * );
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