Define vlc_curent_object in include/vlc_objects.h

diff --git a/extras/zsh.cpp b/extras/zsh.cpp
index 0b518b44884e030b700e336de3346e2964d5da35..76c8d0d9a3c0fc1834850f8d377395a17edc5682 100644 (file)
--- a/extras/zsh.cpp
+++ b/extras/zsh.cpp
@@ -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 PrintOption( char *psz_option, char i_short, char *psz_exlusive,
                    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 )
 {
@@ -49,7 +48,7 @@ int main( int i_argc, char **ppsz_argv )
     /* Create a libvlc structure */
     int i_ret = VLC_Create();
     vlc_t *p_vlc;
-    
+
     if( i_ret < 0 )
     {
         return i_ret;

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 7e87b9e49d603d1040fe429251cb7ac690aaac7f..37930ec3237f4ee44247405437626f7c6a8ed38c 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -93,7 +93,7 @@ VLC_EXPORT( void, __vlc_object_yield, ( 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( void, vlc_list_release, ( vlc_list_t * ) );
-
+VLC_EXPORT( vlc_t *, vlc_current_object, ( int ) );
 /*}@*/
 
 #define vlc_object_create(a,b) \

diff --git a/src/control/core.c b/src/control/core.c
index d38bf4ee1b4dded5aee594e68926e2bf8725fe0d..54147eaf3ce3956188f66596af156d3b92d548ea 100644 (file)
--- a/src/control/core.c
+++ b/src/control/core.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2005 the VideoLAN team
  * $Id$
  *
- * Authors: Clément Stenac <zorglub@videolan.org>
+ * Authors: Cl�ent Stenac <zorglub@videolan.org>
  *
  * 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
@@ -26,8 +26,6 @@
 
 #include <vlc/intf.h>
 
-vlc_t * vlc_current_object( int );
-
 /*************************************************************************
  * Exceptions handling
  *************************************************************************/