vlc_object_get: take instance as a parameter

[vlc] / modules / gui / beos / BeOS.cpp

diff --git a/modules/gui/beos/BeOS.cpp b/modules/gui/beos/BeOS.cpp
index dc5460b54d54ad10a7813aeb198e4e30cfe6c0df..c1dc7e84b1543a3baef5bffd2bbd497020589af6 100644 (file)
--- a/modules/gui/beos/BeOS.cpp
+++ b/modules/gui/beos/BeOS.cpp
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * beos.cpp : BeOS plugin for vlc
  *****************************************************************************
- * Copyright (C) 2000, 2001 VideoLAN
- * $Id: BeOS.cpp,v 1.10 2003/05/07 14:49:19 titer Exp $
+ * Copyright (C) 2000, 2001 the VideoLAN team
+ * $Id$
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -12,7 +12,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -20,44 +20,48 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 
 /*****************************************************************************
  * External prototypes
  *****************************************************************************/
-int  E_(OpenIntf)     ( vlc_object_t * );
-void E_(CloseIntf)    ( vlc_object_t * );
+int  OpenIntf     ( vlc_object_t * );
+void CloseIntf    ( vlc_object_t * );
 
-int  E_(OpenAudio)    ( vlc_object_t * );
-void E_(CloseAudio)   ( vlc_object_t * );
+int  OpenAudio    ( vlc_object_t * );
+void CloseAudio   ( vlc_object_t * );
 
-int  E_(OpenVideo)    ( vlc_object_t * );
-void E_(CloseVideo)   ( vlc_object_t * );
+int  OpenVideo    ( vlc_object_t * );
+void CloseVideo   ( vlc_object_t * );
 
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    add_bool( "beos-dvdmenus", 0, NULL, "Use DVD Menus", "", VLC_TRUE );
-    add_string( "beos-screenshotpath", "/boot/home/", NULL, "Screenshot Path", "", VLC_TRUE );
-    add_string( "beos-screenshotformat", NULL, NULL, "Screenshot Format", "", VLC_TRUE );
-    set_description( _("BeOS standard API interface") );
+    set_category( CAT_INTERFACE );
+    set_subcategory( SUBCAT_INTERFACE_MAIN );
+    add_bool( "beos-dvdmenus", 0, NULL, _("Use DVD Menus"), "", true );
+    set_shortname( "BeOS" );
+    set_description( N_("BeOS standard API interface") );
+    set_capability( "interface", 100 );
+    set_callbacks( OpenIntf, CloseIntf );
+
     add_submodule();
-        set_capability( "interface", 100 );
-        set_callbacks( E_(OpenIntf), E_(CloseIntf) );
-    add_submodule();                                     
         set_capability( "video output", 100 );
-        set_callbacks( E_(OpenVideo), E_(CloseVideo) );
+        set_callbacks( OpenVideo, CloseVideo );
     add_submodule();
         set_capability( "audio output", 100 );
-        set_callbacks( E_(OpenAudio), E_(CloseAudio) );
+        set_callbacks( OpenAudio, CloseAudio );
 vlc_module_end();