Commit 628ec1a0 authored by Jean-Paul Saman's avatar Jean-Paul Saman

Define vlc_curent_object in include/vlc_objects.h

parent 01473463
...@@ -40,7 +40,6 @@ void PrintModuleList( vlc_t *p_vlc, mmap &mods, mcmap &mods2 ); ...@@ -40,7 +40,6 @@ void PrintModuleList( vlc_t *p_vlc, mmap &mods, mcmap &mods2 );
void ParseOption( module_config_t *p_item, mmap &mods, mcmap &mods2 ); void ParseOption( module_config_t *p_item, mmap &mods, mcmap &mods2 );
void PrintOption( char *psz_option, char i_short, char *psz_exlusive, void PrintOption( char *psz_option, char i_short, char *psz_exlusive,
char *psz_text, char *psz_longtext, char *psz_args ); char *psz_text, char *psz_longtext, char *psz_args );
extern "C"{ vlc_t * vlc_current_object( int i_object );}
int main( int i_argc, char **ppsz_argv ) int main( int i_argc, char **ppsz_argv )
{ {
...@@ -49,7 +48,7 @@ int main( int i_argc, char **ppsz_argv ) ...@@ -49,7 +48,7 @@ int main( int i_argc, char **ppsz_argv )
/* Create a libvlc structure */ /* Create a libvlc structure */
int i_ret = VLC_Create(); int i_ret = VLC_Create();
vlc_t *p_vlc; vlc_t *p_vlc;
if( i_ret < 0 ) if( i_ret < 0 )
{ {
return i_ret; return i_ret;
......
...@@ -93,7 +93,7 @@ VLC_EXPORT( void, __vlc_object_yield, ( vlc_object_t * ) ); ...@@ -93,7 +93,7 @@ VLC_EXPORT( void, __vlc_object_yield, ( vlc_object_t * ) );
VLC_EXPORT( void, __vlc_object_release, ( vlc_object_t * ) ); VLC_EXPORT( void, __vlc_object_release, ( vlc_object_t * ) );
VLC_EXPORT( vlc_list_t *, __vlc_list_find, ( vlc_object_t *, int, int ) ); VLC_EXPORT( vlc_list_t *, __vlc_list_find, ( vlc_object_t *, int, int ) );
VLC_EXPORT( void, vlc_list_release, ( vlc_list_t * ) ); VLC_EXPORT( void, vlc_list_release, ( vlc_list_t * ) );
VLC_EXPORT( vlc_t *, vlc_current_object, ( int ) );
/*}@*/ /*}@*/
#define vlc_object_create(a,b) \ #define vlc_object_create(a,b) \
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* Copyright (C) 2005 the VideoLAN team * Copyright (C) 2005 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Clment Stenac <zorglub@videolan.org> * Authors: Cl�ent Stenac <zorglub@videolan.org>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
#include <vlc/intf.h> #include <vlc/intf.h>
vlc_t * vlc_current_object( int );
/************************************************************************* /*************************************************************************
* Exceptions handling * Exceptions handling
*************************************************************************/ *************************************************************************/
......
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