* ALL: new module API. Makes a few things a lot simpler, and we gain

[vlc] / plugins / kde / kde.cpp

diff --git a/plugins/kde/kde.cpp b/plugins/kde/kde.cpp
index 64e3a5e78500d45f6a208d3c08f2e9ab3d9298f3..5e8fd77c0584e707d5a79467f27b3f5e74d3cbfe 100644 (file)
--- a/plugins/kde/kde.cpp
+++ b/plugins/kde/kde.cpp
@@ -2,7 +2,7 @@
  * kde.cpp : KDE plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: kde.cpp,v 1.11 2002/04/04 15:35:09 sam Exp $
+ * $Id: kde.cpp,v 1.15 2002/07/31 20:56:51 sam Exp $
  *
  * Authors: Andres Krapf <dae@chez.com> Sun Mar 25 2001
  *
@@ -36,45 +36,6 @@
 #include <kstdaction.h>
 #include <qwidget.h>
 
-/*****************************************************************************
- * Capabilities defined in the other files.
- *****************************************************************************/
-static void intf_getfunctions( function_list_t * p_function_list );
-
-/*****************************************************************************
- * Build configuration tree.
- *****************************************************************************/
-extern "C"
-{
-
-MODULE_CONFIG_START
-MODULE_CONFIG_STOP
-
-MODULE_INIT_START
-    SET_DESCRIPTION( "KDE interface module" )
-#ifndef WIN32
-    if( getenv( "DISPLAY" ) == NULL )
-    {
-        ADD_CAPABILITY( INTF, 8 )
-    }
-    else
-#endif
-    {
-        ADD_CAPABILITY( INTF, 85 )
-    }
-    ADD_SHORTCUT( "kde" )
-    ADD_PROGRAM( "kvlc" )
-MODULE_INIT_STOP
-
-MODULE_ACTIVATE_START
-    intf_getfunctions( &p_module->p_functions->intf );
-MODULE_ACTIVATE_STOP
-
-MODULE_DEACTIVATE_START
-MODULE_DEACTIVATE_STOP
-
-} // extern "C"
-
 /*****************************************************************************
  * The local class.
  *****************************************************************************/
@@ -94,20 +55,26 @@ class KThread
         ~KThread();
 
         // These methods get exported to the core
-        static int     open    ( intf_thread_t *p_intf );
-        static void    close   ( intf_thread_t *p_intf );
-        static void    run     ( intf_thread_t *p_intf );
+        static int     open    ( vlc_object_t * );
+        static void    close   ( vlc_object_t * );
+        static void    run     ( intf_thread_t * );
 };
 
 /*****************************************************************************
- * Functions exported as capabilities.
+ * Module descriptor
  *****************************************************************************/
-static void intf_getfunctions( function_list_t * p_function_list )
-{
-    p_function_list->functions.intf.pf_open  = KThread::open;
-    p_function_list->functions.intf.pf_close = KThread::close;
-    p_function_list->functions.intf.pf_run   = KThread::run;
-}
+vlc_module_begin();
+#ifdef WIN32
+    int i = 90;
+#else
+    int i = getenv( "DISPLAY" ) == NULL ? 8 : 85;
+#endif
+    set_description( _("KDE interface module") );
+    set_capability( "interface", i );
+    set_program( "kvlc" );
+    //set_callbacks( E_(Open), E_(Close) );
+    set_callbacks( KThread::open, KThread::close );
+vlc_module_end();
 
 /*****************************************************************************
  * KThread::KThread: KDE interface constructor
@@ -117,9 +84,12 @@ KThread::KThread(intf_thread_t *p_intf)
     this->p_intf = p_intf;
 
     p_intf->p_sys->p_about =
-        new KAboutData( "VideoLAN Client", I18N_NOOP("Kvlc"), VERSION,
-            "This is the VideoLAN client, a DVD and MPEG player. It can play MPEG and MPEG 2 files from a file or from a network source.", KAboutData::License_GPL,
-            "(C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 - the VideoLAN Team", 0, 0, "dae@chez.com");
+      new KAboutData( "VideoLAN Client", I18N_NOOP("Kvlc"), VERSION,
+         _("This is the VideoLAN client, a DVD and MPEG player. It can play "
+           "MPEG and MPEG 2 files from a file or from a network source."),
+         KAboutData::License_GPL,
+         _("(C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 - the VideoLAN Team"),
+         0, 0, "");
 
     char *authors[][2] = {
         { "the VideoLAN Team", "<videolan@videolan.org>" },
@@ -131,12 +101,14 @@ KThread::KThread(intf_thread_t *p_intf)
     }
 
     int argc = 1;
-    char *argv[] = { p_main->psz_arg0, NULL };
+    char *argv[] = { p_intf->p_vlc->psz_object_name, NULL };
     KCmdLineArgs::init( argc, argv, p_intf->p_sys->p_about );
 
     p_intf->p_sys->p_app = new KApplication();
     p_intf->p_sys->p_window = new KInterface(p_intf);
     p_intf->p_sys->p_window->setCaption( VOUT_TITLE " (KDE interface)" );
+
+    p_intf->p_sys->p_input = NULL;
 }
 
 /*****************************************************************************
@@ -144,6 +116,11 @@ KThread::KThread(intf_thread_t *p_intf)
  *****************************************************************************/
 KThread::~KThread()
 {
+    if( p_intf->p_sys->p_input )
+    {
+        vlc_object_release( p_intf->p_sys->p_input );
+    }
+
     /* XXX: can be deleted if the user closed the window ! */
     //delete p_intf->p_sys->p_window;
 
@@ -154,16 +131,20 @@ KThread::~KThread()
 /*****************************************************************************
  * KThread::open: initialize and create window
  *****************************************************************************/
-int KThread::open(intf_thread_t *p_intf)
+int KThread::open(vlc_object_t *p_this)
 {
+    intf_thread_t *p_intf = (intf_thread_t *)p_this;
+
     /* Allocate instance and initialize some members */
     p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) );
     if( p_intf->p_sys == NULL )
     {
-        intf_ErrMsg( "intf error: %s", strerror(ENOMEM) );
+        msg_Err( p_intf, "out of memory" );
         return( 1 );
     }
 
+    p_intf->pf_run = KThread::run;
+
     p_intf->p_sys->p_thread = new KThread(p_intf);
     return ( 0 );
 }
@@ -171,8 +152,10 @@ int KThread::open(intf_thread_t *p_intf)
 /*****************************************************************************
  * KThread::close: destroy interface window
  *****************************************************************************/
-void KThread::close(intf_thread_t *p_intf)
+void KThread::close(vlc_object_t *p_this)
 {
+    intf_thread_t *p_intf = (intf_thread_t *)p_this;
+
     delete p_intf->p_sys->p_thread;
     free( p_intf->p_sys );
 }