/*****************************************************************************
* gtk_main.c : Gtk+ wrapper for gtk_main
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: gtk_main.c,v 1.8 2002/10/04 13:13:54 sam Exp $
+ * Copyright (C) 2002 the VideoLAN team
+ * $Id$
*
* 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
*
* 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 <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
-#include <stdlib.h> /* atexit() */
#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 int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
-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;
+static void* GtkMain ( vlc_object_t * );
/*****************************************************************************
* Local variables (mutex-protected).
*****************************************************************************/
-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 );
- add_shortcut( "gnome" );
+vlc_module_begin ()
+ int i_cap;
+ set_description( N_("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_callbacks( Open, Close );
- linked_with_a_crap_library_which_uses_atexit();
-vlc_module_end();
+ set_capability( "gui-helper", i_cap )
+ set_callbacks( Open, Close )
+ linked_with_a_crap_library_which_uses_atexit ()
+vlc_module_end ()
+
+static vlc_mutex_t gtk_lock = VLC_STATIC_MUTEX;
/*****************************************************************************
* Open: initialize and create window
*****************************************************************************/
static int Open( vlc_object_t *p_this )
{
- vlc_mutex_lock( &p_this->p_libvlc->global_lock );
+ vlc_mutex_lock( >k_lock );
if( i_refcount > 0 )
{
i_refcount++;
- vlc_mutex_unlock( &p_this->p_libvlc->global_lock );
+ vlc_mutex_unlock( >k_lock );
return VLC_SUCCESS;
}
- p_gtk_main = vlc_object_create( p_this, sizeof(gtk_main_t) );
+ p_gtk_main = vlc_object_create( p_this, sizeof( vlc_object_t ) );
/* Only initialize gthreads if it's the first time we do it */
if( !g_thread_supported() )
/* Launch the gtk_main() thread. It will not return until it has
* called gdk_threads_enter(), which ensures us thread safety. */
if( vlc_thread_create( p_gtk_main, "gtk_main", GtkMain,
- VLC_THREAD_PRIORITY_LOW, VLC_TRUE ) )
+ VLC_THREAD_PRIORITY_LOW ) )
{
- vlc_object_destroy( p_gtk_main );
+ vlc_object_release( p_gtk_main );
i_refcount--;
- vlc_mutex_unlock( &p_this->p_libvlc->global_lock );
- return VLC_ETHREAD;
+ vlc_mutex_unlock( >k_lock );
+ return VLC_ENOMEM;
}
i_refcount++;
- vlc_mutex_unlock( &p_this->p_libvlc->global_lock );
+ vlc_mutex_unlock( >k_lock );
return VLC_SUCCESS;
}
*****************************************************************************/
static void Close( vlc_object_t *p_this )
{
- vlc_mutex_lock( &p_this->p_libvlc->global_lock );
+ vlc_mutex_lock( >k_lock );
i_refcount--;
- if( i_refcount > 0 )
+ if( --i_refcount == 0 )
{
- vlc_mutex_unlock( &p_this->p_libvlc->global_lock );
- return;
- }
+ gtk_main_quit();
+ vlc_thread_join( p_gtk_main );
- gtk_main_quit();
- vlc_thread_join( p_gtk_main );
-
- vlc_object_destroy( p_gtk_main );
- p_gtk_main = NULL;
-
- vlc_mutex_unlock( &p_this->p_libvlc->global_lock );
+ vlc_object_release( p_gtk_main );
+ p_gtk_main = NULL;
+ }
+ vlc_mutex_unlock( >k_lock );
}
static gint foo( gpointer bar ) { return TRUE; }
* this part of the interface is in a separate thread so that we can call
* gtk_main() from within it without annoying the rest of the program.
*****************************************************************************/
-static void GtkMain( vlc_object_t *p_this )
+static void* GtkMain( vlc_object_t *p_this )
{
/* 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;
+ int canc = vlc_savecancel ();
/* 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
- gnome_init( p_this->p_vlc->psz_object_name, VERSION, i_args, p_args );
+#if defined(MODULE_NAME_IS_gnome_main)
+ gnome_init( PACKAGE, 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 );
gtk_main();
gdk_threads_leave();
+ vlc_restorecancel (canc);
+ return NULL;
}
-
projects / vlc / blobdiff