* gtk_main.c : Gtk+ wrapper for gtk_main
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: gtk_main.c,v 1.9 2002/10/04 18:07:21 sam Exp $
+ * $Id: gtk_main.c,v 1.15 2003/03/30 18:14:38 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* 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
#include <gtk/gtk.h>
-#ifdef MODULE_NAME_IS_gnome_main
+#if defined(MODULE_NAME_IS_gtk2_main)
+# include <glib.h>
+#endif
+
+#if defined(MODULE_NAME_IS_gnome_main) || defined(MODULE_NAME_IS_gnome2_main)
# include <gnome.h>
#endif
static void GtkMain ( vlc_object_t * );
-/*****************************************************************************
- * The gtk_main_t object.
- *****************************************************************************/
-#define MAX_ATEXIT 10
-
-typedef struct gtk_main_t
-{
- VLC_COMMON_MEMBERS
-
-} gtk_main_t;
-
/*****************************************************************************
* Local variables (mutex-protected).
*****************************************************************************/
-static vlc_mutex_t * p_gtklock;
-static int i_refcount = 0;
-static gtk_main_t * p_gtk_main = NULL;
+static int i_refcount = 0;
+static vlc_object_t * p_gtk_main = NULL;
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_module_begin();
- set_description( _("Gtk+ helper module") );
-#ifdef MODULE_NAME_IS_gtk_main
- set_capability( "gtk_main", 90 );
-#else
- set_capability( "gtk_main", 100 );
+ int i_cap;
+ set_description( _("Gtk+ GUI helper") );
+#if defined(MODULE_NAME_IS_gtk_main)
+ i_cap = 90;
+ add_shortcut( "gtk" );
+#elif defined(MODULE_NAME_IS_gnome_main)
+ i_cap = 100;
+ add_shortcut( "gtk" );
add_shortcut( "gnome" );
+#elif defined(MODULE_NAME_IS_gtk2_main)
+ i_cap = 95;
+ add_shortcut( "gtk2" );
+#elif defined(MODULE_NAME_IS_gnome2_main)
+ i_cap = 105;
+ add_shortcut( "gtk2" );
+ add_shortcut( "gnome2" );
#endif
- add_shortcut( "gtk" );
+ set_capability( "gui-helper", i_cap );
set_callbacks( Open, Close );
linked_with_a_crap_library_which_uses_atexit();
vlc_module_end();
*****************************************************************************/
static int Open( vlc_object_t *p_this )
{
+ vlc_value_t lockval;
+
/* FIXME: put this in the module (de)initialization ASAP */
- p_gtklock = vlc_mutex_need( p_this, "gtk" );
+ var_Create( p_this->p_libvlc, "gtk", VLC_VAR_MUTEX );
- vlc_mutex_lock( p_gtklock );
+ var_Get( p_this->p_libvlc, "gtk", &lockval );
+ vlc_mutex_lock( lockval.p_address );
if( i_refcount > 0 )
{
i_refcount++;
- vlc_mutex_unlock( p_gtklock );
+ vlc_mutex_unlock( lockval.p_address );
return VLC_SUCCESS;
}
- p_gtk_main = vlc_object_create( p_this, sizeof(gtk_main_t) );
+ p_gtk_main = vlc_object_create( p_this, VLC_OBJECT_GENERIC );
/* Only initialize gthreads if it's the first time we do it */
if( !g_thread_supported() )
{
vlc_object_destroy( p_gtk_main );
i_refcount--;
- vlc_mutex_unlock( p_gtklock );
- vlc_mutex_unneed( p_this, "gtk" );
+ vlc_mutex_unlock( lockval.p_address );
+ var_Destroy( p_this->p_libvlc, "gtk" );
return VLC_ETHREAD;
}
i_refcount++;
- vlc_mutex_unlock( p_gtklock );
+ vlc_mutex_unlock( lockval.p_address );
return VLC_SUCCESS;
}
*****************************************************************************/
static void Close( vlc_object_t *p_this )
{
- vlc_mutex_lock( p_gtklock );
+ vlc_value_t lockval;
+
+ var_Get( p_this->p_libvlc, "gtk", &lockval );
+ vlc_mutex_lock( lockval.p_address );
i_refcount--;
if( i_refcount > 0 )
{
- vlc_mutex_unlock( p_gtklock );
- vlc_mutex_unneed( p_this, "gtk" );
+ vlc_mutex_unlock( lockval.p_address );
+ var_Destroy( p_this->p_libvlc, "gtk" );
return;
}
vlc_object_destroy( p_gtk_main );
p_gtk_main = NULL;
- vlc_mutex_unlock( p_gtklock );
- vlc_mutex_unneed( p_this, "gtk" );
+ vlc_mutex_unlock( lockval.p_address );
+ var_Destroy( p_this->p_libvlc, "gtk" );
}
static gint foo( gpointer bar ) { return TRUE; }
{
/* gtk_init needs to know the command line. We don't care, so we
* give it an empty one */
- static char *p_args[] = { "" };
-#ifdef MODULE_NAME_IS_gtk_main
+ static char *p_args[] = { "", NULL };
+#if defined(MODULE_NAME_IS_gtk_main) || defined(MODULE_NAME_IS_gtk2_main)
static char **pp_args = p_args;
#endif
static int i_args = 1;
/* FIXME: deprecated ? */
- /* gdk_threads_init(); */
+#if defined(MODULE_NAME_IS_gtk2_main) || defined(MODULE_NAME_IS_gnome2_main)
+ gdk_threads_init();
+#endif
-#ifdef MODULE_NAME_IS_gnome_main
+#if defined(MODULE_NAME_IS_gnome_main)
gnome_init( p_this->p_vlc->psz_object_name, VERSION, i_args, p_args );
+#elif defined(MODULE_NAME_IS_gnome2_main)
+ gnome_program_init( PACKAGE, VERSION, LIBGNOMEUI_MODULE,
+ i_args, p_args,
+ GNOME_PARAM_APP_DATADIR, "",//PACKAGE_DATA_DIR,
+ NULL );
#else
gtk_set_locale();
gtk_init( &i_args, &pp_args );
projects / vlc / blobdiff