/*****************************************************************************
* gtk_main.c : Gtk+ wrapper for gtk_main
*****************************************************************************
- * Copyright (C) 2002 VideoLAN (Centrale Réseaux) and its contributors
+ * Copyright (C) 2002 the VideoLAN team
* $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* 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>
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
-static void GtkMain ( vlc_object_t * );
+static void* GtkMain ( vlc_object_t * );
/*****************************************************************************
* Local variables (mutex-protected).
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-vlc_module_begin();
+vlc_module_begin ()
int i_cap;
- set_description( _("Gtk+ GUI helper") );
+ set_description( N_("Gtk+ GUI helper") )
#if defined(MODULE_NAME_IS_gtk_main)
i_cap = 90;
- add_shortcut( "gtk" );
+ add_shortcut( "gtk" )
#elif defined(MODULE_NAME_IS_gnome_main)
i_cap = 100;
- add_shortcut( "gtk" );
- add_shortcut( "gnome" );
+ add_shortcut( "gtk" )
+ add_shortcut( "gnome" )
#elif defined(MODULE_NAME_IS_gtk2_main)
i_cap = 95;
- add_shortcut( "gtk2" );
+ add_shortcut( "gtk2" )
#elif defined(MODULE_NAME_IS_gnome2_main)
i_cap = 105;
- add_shortcut( "gtk2" );
- add_shortcut( "gnome2" );
+ add_shortcut( "gtk2" )
+ add_shortcut( "gnome2" )
#endif
- set_capability( "gui-helper", i_cap );
- 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_value_t lockval;
-
- /* FIXME: put this in the module (de)initialization ASAP */
- var_Create( p_this->p_libvlc, "gtk", VLC_VAR_MUTEX );
-
- var_Get( p_this->p_libvlc, "gtk", &lockval );
- vlc_mutex_lock( lockval.p_address );
+ vlc_mutex_lock( >k_lock );
if( i_refcount > 0 )
{
i_refcount++;
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( >k_lock );
return VLC_SUCCESS;
}
- p_gtk_main = vlc_object_create( p_this, VLC_OBJECT_GENERIC );
+ 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( lockval.p_address );
- var_Destroy( p_this->p_libvlc, "gtk" );
- return VLC_ETHREAD;
+ vlc_mutex_unlock( >k_lock );
+ return VLC_ENOMEM;
}
i_refcount++;
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( >k_lock );
return VLC_SUCCESS;
}
*****************************************************************************/
static void Close( vlc_object_t *p_this )
{
- vlc_value_t lockval;
-
- var_Get( p_this->p_libvlc, "gtk", &lockval );
- vlc_mutex_lock( lockval.p_address );
+ vlc_mutex_lock( >k_lock );
i_refcount--;
- if( i_refcount > 0 )
+ if( --i_refcount == 0 )
{
- vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_this->p_libvlc, "gtk" );
- 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( lockval.p_address );
- var_Destroy( p_this->p_libvlc, "gtk" );
+ 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 **pp_args = p_args;
#endif
static int i_args = 1;
+ int canc = vlc_savecancel ();
/* FIXME: deprecated ? */
#if defined(MODULE_NAME_IS_gtk2_main) || defined(MODULE_NAME_IS_gnome2_main)
#endif
#if defined(MODULE_NAME_IS_gnome_main)
- gnome_init( p_this->p_vlc->psz_object_name, VERSION, i_args, p_args );
+ 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,
gtk_main();
gdk_threads_leave();
+ vlc_restorecancel (canc);
+ return NULL;
}
-
projects / vlc / blobdiff