* gnome.c : Gnome plugin for vlc
*****************************************************************************
* Copyright (C) 2000 VideoLAN
- * $Id: gnome.c,v 1.23 2002/05/30 13:39:43 asmax Exp $
+ * $Id: gnome.c,v 1.32 2002/07/31 20:56:51 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
#include <string.h> /* strerror() */
#include <stdio.h>
-#include <videolan/vlc.h>
+#include <vlc/vlc.h>
+#include <vlc/intf.h>
#include <gnome.h>
-#include "stream_control.h"
-#include "input_ext-intf.h"
-
-#include "interface.h"
-#include "intf_playlist.h"
-
-#include "video.h"
-#include "video_output.h"
-
#include "gnome_callbacks.h"
#include "gnome_interface.h"
#include "gnome_support.h"
/*****************************************************************************
* Local prototypes.
*****************************************************************************/
-static void intf_getfunctions( function_list_t * p_function_list );
-static int intf_Open ( intf_thread_t *p_intf );
-static void intf_Close ( intf_thread_t *p_intf );
-static void intf_Run ( intf_thread_t *p_intf );
+static int Open ( vlc_object_t * );
+static void Close ( vlc_object_t * );
-static gint GnomeManage ( gpointer p_data );
+static void Run ( intf_thread_t * );
+static gint Manage ( gpointer );
/*****************************************************************************
- * Building configuration tree
+ * Local variables (mutex-protected).
+ *****************************************************************************/
+static void ** pp_global_data = NULL;
+
+/*****************************************************************************
+ * Module descriptor
*****************************************************************************/
#define TOOLTIPS_TEXT N_("show tooltips")
#define TOOLTIPS_LONGTEXT N_("Show tooltips for configuration options.")
"You can set the maximum height that the configuration windows in the " \
"preferences menu will occupy.")
-MODULE_CONFIG_START
-ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL )
-ADD_BOOL ( "gnome-tooltips", 1, GtkHideTooltips, TOOLTIPS_TEXT,
- TOOLTIPS_LONGTEXT )
-ADD_BOOL ( "gnome-toolbartext", 1, GtkHideToolbarText, TOOLBAR_TEXT,
- TOOLBAR_LONGTEXT )
-ADD_INTEGER( "gnome-prefs-maxh", 480, NULL, PREFS_MAXH_TEXT,
- PREFS_MAXH_LONGTEXT )
-MODULE_CONFIG_STOP
-
-MODULE_INIT_START
- SET_DESCRIPTION( _("Gnome interface module") )
-#ifndef WIN32
- if( getenv( "DISPLAY" ) == NULL )
- {
- ADD_CAPABILITY( INTF, 15 )
- }
- else
+vlc_module_begin();
+#ifdef WIN32
+ int i = 90;
+#else
+ int i = getenv( "DISPLAY" ) == NULL ? 15 : 100;
#endif
- {
- ADD_CAPABILITY( INTF, 100 )
- }
- ADD_SHORTCUT( "gnome" )
- ADD_PROGRAM( "gnome-vlc" )
-MODULE_INIT_STOP
-
-MODULE_ACTIVATE_START
- intf_getfunctions( &p_module->p_functions->intf );
-MODULE_ACTIVATE_STOP
-
-MODULE_DEACTIVATE_START
-MODULE_DEACTIVATE_STOP
+ pp_global_data = p_module->p_vlc->pp_global_data;
+
+ add_category_hint( N_("Miscellaneous"), NULL );
+ add_bool( "gnome-tooltips", 1, GtkHideTooltips,
+ TOOLTIPS_TEXT, TOOLTIPS_LONGTEXT );
+ add_bool( "gnome-toolbartext", 1, GtkHideToolbarText, TOOLBAR_TEXT,
+ TOOLBAR_LONGTEXT );
+ add_integer( "gnome-prefs-maxh", 480, NULL,
+ PREFS_MAXH_TEXT, PREFS_MAXH_LONGTEXT );
+
+ set_description( _("GNOME interface module") );
+ set_capability( "interface", i );
+ set_callbacks( Open, Close );
+ set_program( "gnome-vlc" );
+vlc_module_end();
/*****************************************************************************
* g_atexit: kludge to avoid the Gnome thread to segfault at exit
*****************************************************************************/
void g_atexit( GVoidFunc func )
{
- intf_thread_t *p_intf = p_main->p_intf;
+ intf_thread_t *p_intf;
+
int i_dummy;
+ if( pp_global_data == NULL )
+ {
+ atexit( func );
+ return;
+ }
+
+ p_intf = (intf_thread_t *)*pp_global_data;
+ if( p_intf == NULL )
+ {
+ return;
+ }
+
for( i_dummy = 0;
i_dummy < MAX_ATEXIT && p_intf->p_sys->pf_callback[i_dummy] != NULL;
i_dummy++ )
if( i_dummy >= MAX_ATEXIT - 1 )
{
- intf_ErrMsg( "intf error: too many atexit() callbacks to register" );
+ msg_Err( p_intf, "too many atexit() callbacks to register" );
return;
}
}
/*****************************************************************************
- * Functions exported as capabilities. They are declared as static so that
- * we don't pollute the namespace too much.
+ * Open: initialize and create window
*****************************************************************************/
-static void intf_getfunctions( function_list_t * p_function_list )
+static int Open( vlc_object_t *p_this )
{
- p_function_list->functions.intf.pf_open = intf_Open;
- p_function_list->functions.intf.pf_close = intf_Close;
- p_function_list->functions.intf.pf_run = intf_Run;
-}
+ intf_thread_t *p_intf = (intf_thread_t *)p_this;
-/*****************************************************************************
- * intf_Open: initialize and create window
- *****************************************************************************/
-static int intf_Open( intf_thread_t *p_intf )
-{
/* Allocate instance and initialize some members */
p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
if( p_intf->p_sys == NULL )
{
- intf_ErrMsg("error: %s", strerror(ENOMEM));
+ msg_Err( p_intf, "out of memory" );
return( 1 );
}
- p_intf->p_sys->p_sub = intf_MsgSub();
+ p_intf->pf_run = Run;
+
+ p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
/* Initialize Gnome thread */
p_intf->p_sys->b_playing = 0;
p_intf->p_sys->b_window_changed = 0;
p_intf->p_sys->b_playlist_changed = 0;
+ p_intf->p_sys->p_input = NULL;
p_intf->p_sys->i_playing = -1;
p_intf->p_sys->b_slider_free = 1;
}
/*****************************************************************************
- * intf_Close: destroy interface window
+ * Close: destroy interface window
*****************************************************************************/
-static void intf_Close( intf_thread_t *p_intf )
+static void Close( vlc_object_t *p_this )
{
- intf_MsgUnsub( p_intf->p_sys->p_sub );
+ intf_thread_t *p_intf = (intf_thread_t *)p_this;
+
+ if( p_intf->p_sys->p_input )
+ {
+ vlc_object_release( p_intf->p_sys->p_input );
+ }
+
+ msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
/* Destroy structure */
free( p_intf->p_sys );
}
/*****************************************************************************
- * intf_Run: Gnome thread
+ * Run: Gnome thread
*****************************************************************************
* 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.
* XXX: the approach may look kludgy, and probably is, but I could not find
* a better way to dynamically load a Gnome interface at runtime.
*****************************************************************************/
-static void intf_Run( intf_thread_t *p_intf )
+static void Run( intf_thread_t *p_intf )
{
/* gnome_init needs to know the command line. We don't care, so we
* give it an empty one */
};
/* Initialize Gnome */
- gnome_init( p_main->psz_arg0, VERSION, i_args, p_args );
+
+ /* gnome_init will register stuff with g_atexit, so we need to take
+ * the global lock if we want to be able to intercept the calls */
+ vlc_mutex_lock( p_intf->p_vlc->p_global_lock );
+ *p_intf->p_vlc->pp_global_data = p_intf;
+ gnome_init( p_intf->p_vlc->psz_object_name, VERSION, i_args, p_args );
+ vlc_mutex_unlock( p_intf->p_vlc->p_global_lock );
/* Create some useful widgets that will certainly be used */
p_intf->p_sys->p_window = create_intf_window( );
p_intf->p_sys->p_popup = create_intf_popup( );
- p_intf->p_sys->p_playlist = create_intf_playlist();
+ p_intf->p_sys->p_playwin = create_intf_playlist();
p_intf->p_sys->p_messages = create_intf_messages();
/* Set the title of the main window */
1, GDK_ACTION_COPY );
/* Accept file drops on the playlist window */
gtk_drag_dest_set( GTK_WIDGET( gtk_object_get_data( GTK_OBJECT(
- p_intf->p_sys->p_playlist ), "playlist_clist") ),
+ p_intf->p_sys->p_playwin ), "playlist_clist") ),
GTK_DEST_DEFAULT_ALL, target_table,
1, GDK_ACTION_COPY );
p_intf->p_sys->f_adj_oldvalue = 0;
#undef P_SLIDER
+ p_intf->p_sys->p_tooltips = gtk_tooltips_new();
+
/* We don't create these ones yet because we perhaps won't need them */
p_intf->p_sys->p_about = NULL;
p_intf->p_sys->p_modules = NULL;
- p_intf->p_sys->p_fileopen = NULL;
- p_intf->p_sys->p_disc = NULL;
- p_intf->p_sys->p_network = NULL;
- p_intf->p_sys->p_sat = NULL;
+ p_intf->p_sys->p_open = NULL;
p_intf->p_sys->p_jump = NULL;
- p_intf->p_sys->p_tooltips = gtk_tooltips_new();
/* Hide tooltips if the option is set */
- if( !config_GetIntVariable( "gnome-tooltips" ) )
+ if( !config_GetInt( p_intf, "gnome-tooltips" ) )
+ {
gtk_tooltips_disable( p_intf->p_sys->p_tooltips );
+ }
/* Hide toolbar text of the option is set */
- if( !config_GetIntVariable( "gnome-toolbartext" ) )
+ if( !config_GetInt( p_intf, "gnome-toolbartext" ) )
+ {
gtk_toolbar_set_style(
GTK_TOOLBAR(lookup_widget( p_intf->p_sys->p_window, "toolbar" )),
GTK_TOOLBAR_ICONS );
+ }
/* Store p_intf to keep an eye on it */
gtk_object_set_data( GTK_OBJECT(p_intf->p_sys->p_window),
gtk_object_set_data( GTK_OBJECT(p_intf->p_sys->p_popup),
"p_intf", p_intf );
- gtk_object_set_data( GTK_OBJECT( p_intf->p_sys->p_playlist ),
+ gtk_object_set_data( GTK_OBJECT( p_intf->p_sys->p_playwin ),
"p_intf", p_intf );
gtk_object_set_data( GTK_OBJECT( p_intf->p_sys->p_messages ),
/* Sleep to avoid using all CPU - since some interfaces needs to access
* keyboard events, a 100ms delay is a good compromise */
- i_dummy = gtk_timeout_add( INTF_IDLE_SLEEP / 1000, GnomeManage, p_intf );
+ i_dummy = gtk_timeout_add( INTF_IDLE_SLEEP / 1000, Manage, p_intf );
/* Enter gnome mode */
gtk_main();
/* following functions are local */
/*****************************************************************************
- * GnomeManage: manage main thread messages
+ * Manage: manage main thread messages
*****************************************************************************
* In this function, called approx. 10 times a second, we check what the
* main program wanted to tell us.
*****************************************************************************/
-static gint GnomeManage( gpointer p_data )
+static gint Manage( gpointer p_data )
{
#define p_intf ((intf_thread_t *)p_data)
- static GdkColor white = { 0, 0xffff, 0xffff, 0xffff };
- static GdkColor red = { 0, 0xffff, 0x6666, 0x6666 };
- static GdkColor gray = { 0, 0xaaaa, 0xaaaa, 0xaaaa };
- GdkColor *p_color;
-
int i_start, i_stop;
vlc_mutex_lock( &p_intf->change_lock );
if( p_intf->p_sys->p_sub->i_start != i_stop )
{
+ static GdkColor white = { 0, 0xffff, 0xffff, 0xffff };
+ static GdkColor gray = { 0, 0xaaaa, 0xaaaa, 0xaaaa };
+ static GdkColor yellow = { 0, 0xffff, 0xffff, 0x6666 };
+ static GdkColor red = { 0, 0xffff, 0x6666, 0x6666 };
+
+ static const char * ppsz_type[4] = { ": ", " error: ", " warning: ",
+ " debug: " };
+ static GdkColor * pp_color[4] = { &white, &red, &yellow, &gray };
+
for( i_start = p_intf->p_sys->p_sub->i_start;
i_start != i_stop;
- i_start = (i_start+1) % INTF_MSG_QSIZE )
+ i_start = (i_start+1) % VLC_MSG_QSIZE )
{
/* Append all messages to log window */
- switch( p_intf->p_sys->p_sub->p_msg[i_start].i_type )
- {
- case INTF_MSG_ERR:
- p_color = &red;
- break;
- case INTF_MSG_WARN:
- p_color = &gray;
- break;
- default:
- p_color = &white;
- break;
- }
+ gtk_text_insert( p_intf->p_sys->p_messages_text, NULL, &gray,
+ NULL, p_intf->p_sys->p_sub->p_msg[i_start].psz_module, -1 );
+
+ gtk_text_insert( p_intf->p_sys->p_messages_text, NULL, &gray,
+ NULL, ppsz_type[p_intf->p_sys->p_sub->p_msg[i_start].i_type],
+ -1 );
+
+ gtk_text_insert( p_intf->p_sys->p_messages_text, NULL,
+ pp_color[p_intf->p_sys->p_sub->p_msg[i_start].i_type], NULL,
+ p_intf->p_sys->p_sub->p_msg[i_start].psz_msg, -1 );
- gtk_text_insert( p_intf->p_sys->p_messages_text, NULL, p_color,
- NULL, p_intf->p_sys->p_sub->p_msg[i_start].psz_msg, -1 );
- gtk_text_insert( p_intf->p_sys->p_messages_text, NULL, p_color,
+ gtk_text_insert( p_intf->p_sys->p_messages_text, NULL, &gray,
NULL, "\n", -1 );
}
/* Update the playlist */
GtkPlayListManage( p_intf );
- if( p_input_bank->pp_input[0] != NULL && !p_intf->b_die )
+ /* Update the input */
+ if( p_intf->p_sys->p_input != NULL )
{
- vlc_mutex_lock( &p_input_bank->pp_input[0]->stream.stream_lock );
+ if( p_intf->p_sys->p_input->b_dead )
+ {
+ vlc_object_release( p_intf->p_sys->p_input );
+ p_intf->p_sys->p_input = NULL;
+ }
+ }
+
+ if( p_intf->p_sys->p_input == NULL )
+ {
+ p_intf->p_sys->p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
+ FIND_ANYWHERE );
+ }
+
+ if( p_intf->p_sys->p_input )
+ {
+ input_thread_t *p_input = p_intf->p_sys->p_input;
+
+ vlc_mutex_lock( &p_input->stream.stream_lock );
- if( !p_input_bank->pp_input[0]->b_die )
+ if( !p_input->b_die )
{
/* New input or stream map change */
- if( p_input_bank->pp_input[0]->stream.b_changed )
+ if( p_input->stream.b_changed )
{
GtkModeManage( p_intf );
GtkSetupMenus( p_intf );
}
/* Manage the slider */
- if( p_input_bank->pp_input[0]->stream.b_seekable &&
- p_intf->p_sys->b_playing )
+ if( p_input->stream.b_seekable && p_intf->p_sys->b_playing )
{
- float newvalue;
- newvalue = p_intf->p_sys->p_adj->value;
+ float newvalue = p_intf->p_sys->p_adj->value;
-#define p_area p_input_bank->pp_input[0]->stream.p_selected_area
+#define p_area p_input->stream.p_selected_area
/* If the user hasn't touched the slider since the last time,
* then the input can safely change it */
if( newvalue == p_intf->p_sys->f_adj_oldvalue )
{
/* Update the value */
- p_intf->p_sys->p_adj->value = p_intf->p_sys->f_adj_oldvalue =
+ p_intf->p_sys->p_adj->value =
+ p_intf->p_sys->f_adj_oldvalue =
( 100. * p_area->i_tell ) / p_area->i_size;
gtk_signal_emit_by_name( GTK_OBJECT( p_intf->p_sys->p_adj ),
* finished dragging the slider */
else if( p_intf->p_sys->b_slider_free )
{
- off_t i_seek = ( newvalue * p_area->i_size ) / 100;
+ if( newvalue > 0. && newvalue < 100. )
+ {
+ off_t i_seek = ( newvalue * p_area->i_size ) / 100;
- vlc_mutex_unlock( &p_input_bank->pp_input[0]->stream.stream_lock );
- input_Seek( p_input_bank->pp_input[0], i_seek );
- vlc_mutex_lock( &p_input_bank->pp_input[0]->stream.stream_lock );
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+ input_Seek( p_input, i_seek, INPUT_SEEK_SET );
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+ }
/* Update the old value */
p_intf->p_sys->f_adj_oldvalue = newvalue;
}
if( p_intf->p_sys->i_part !=
- p_input_bank->pp_input[0]->stream.p_selected_area->i_part )
+ p_input->stream.p_selected_area->i_part )
{
p_intf->p_sys->b_chapter_update = 1;
GtkSetupMenus( p_intf );
}
}
- vlc_mutex_unlock( &p_input_bank->pp_input[0]->stream.stream_lock );
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
}
else if( p_intf->p_sys->b_playing && !p_intf->b_die )
{
p_intf->p_sys->b_playing = 0;
}
- /* Manage core vlc functions through the callback */
- p_intf->pf_manage( p_intf );
-
if( p_intf->b_die )
{
vlc_mutex_unlock( &p_intf->change_lock );
projects / vlc / blobdiff