/*****************************************************************************
* osd.c - The OSD Menu core code.
*****************************************************************************
- * Copyright (C) 2005-2007 M2X
+ * Copyright (C) 2005-2008 M2X
* $Id$
*
* Authors: Jean-Paul Saman <jpsaman #_at_# m2x dot nl>
# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_keys.h>
#include <vlc_osd.h>
#include <vlc_image.h>
#undef OSD_MENU_DEBUG
-#if 0
-static const char *ppsz_button_states[] = { "unselect", "select", "pressed" };
-#endif
-
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static inline osd_state_t *osd_VolumeStateChange( osd_state_t *, int );
static int osd_VolumeStep( vlc_object_t *, int, int );
static bool osd_isVisible( osd_menu_t *p_osd );
-static osd_menu_t *osd_ParserLoad( vlc_object_t *, const char * );
+static bool osd_ParserLoad( osd_menu_t *, const char * );
static void osd_ParserUnload( osd_menu_t * );
static bool osd_isVisible( osd_menu_t *p_osd )
/*****************************************************************************
* Wrappers for loading and unloading osd parser modules.
*****************************************************************************/
-static osd_menu_t *osd_ParserLoad( vlc_object_t *p_this, const char *psz_file )
+static bool osd_ParserLoad( osd_menu_t *p_menu, const char *psz_file )
{
- osd_menu_t *p_menu;
- static const char osdmenu_name[] = "osd menu";
-
- p_menu = vlc_custom_create( p_this, sizeof( *p_menu ), VLC_OBJECT_OSDMENU,
- osdmenu_name );
- if( !p_menu )
- {
- msg_Err( p_this, "out of memory" );
- return NULL;
- }
- vlc_object_yield( p_menu );
- vlc_object_attach( p_menu, p_this->p_libvlc );
-
/* Stuff needed for Parser */
p_menu->psz_file = strdup( psz_file );
- p_menu->p_image = image_HandlerCreate( p_this );
+ p_menu->p_image = image_HandlerCreate( p_menu );
if( !p_menu->p_image || !p_menu->psz_file )
{
- msg_Err( p_this, "unable to load images, aborting .." );
- osd_ParserUnload( p_menu );
- return NULL;
+ msg_Err( p_menu, "unable to load images, aborting .." );
+ return true;
}
else
{
else
psz_type = (char*)"import-osd-xml";
- p_menu->p_parser = module_Need( p_menu, "osd parser",
+ p_menu->p_parser = module_need( p_menu, "osd parser",
psz_type, true );
if( !p_menu->p_parser )
{
- osd_ParserUnload( p_menu );
- return NULL;
+ return false;
}
}
- return p_menu;
+ return true;
}
static void osd_ParserUnload( osd_menu_t *p_menu )
{
if( p_menu->p_image )
image_HandlerDelete( p_menu->p_image );
- if( p_menu->psz_file )
- free( p_menu->psz_file );
if( p_menu->p_parser )
- module_Unneed( p_menu, p_menu->p_parser );
+ module_unneed( p_menu, p_menu->p_parser );
- vlc_object_detach( p_menu );
- vlc_object_release( p_menu );
+ free( p_menu->psz_file );
}
/**
* Change state on an osd_button_t.
*
- * This function selects the specified state and returns a pointer to it. The
+ * This function selects the specified state and returns a pointer vlc_custom_createto it. The
* following states are currently supported:
* \see OSD_BUTTON_UNSELECT
* \see OSD_BUTTON_SELECT
osd_menu_t *__osd_MenuCreate( vlc_object_t *p_this, const char *psz_file )
{
osd_menu_t *p_osd = NULL;
- vlc_value_t lockval;
+ vlc_value_t lockval, val;
int i_volume = 0;
int i_steps = 0;
/* to be sure to avoid multiple creation */
var_Create( p_this->p_libvlc, "osd_mutex", VLC_VAR_MUTEX );
+ var_Create( p_this->p_libvlc, "osd", VLC_VAR_ADDRESS );
var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
vlc_mutex_lock( lockval.p_address );
- p_osd = vlc_object_find( p_this, VLC_OBJECT_OSDMENU, FIND_ANYWHERE );
- if( p_osd == NULL )
+ var_Get( p_this->p_libvlc, "osd", &val );
+ if( val.p_address == NULL )
{
- vlc_value_t val;
+ static const char osdmenu_name[] = "osd menu";
- /* Parse configuration file */
- p_osd = osd_ParserLoad( p_this, psz_file );
+ p_osd = vlc_custom_create( p_this, sizeof( *p_osd ),
+ VLC_OBJECT_GENERIC, osdmenu_name );
if( !p_osd )
+ return NULL;
+
+ p_osd->p_parser = NULL;
+ vlc_object_attach( p_osd, p_this->p_libvlc );
+
+ /* Parse configuration file */
+ if ( !osd_ParserLoad( p_osd, psz_file ) )
+ goto error;
+ if( !p_osd->p_state )
goto error;
/* Setup default button (first button) */
var_Create( p_osd, "osd-menu-update", VLC_VAR_BOOL );
var_Create( p_osd, "osd-menu-visible", VLC_VAR_BOOL );
- val.b_bool = false;
- var_Set( p_osd, "osd-menu-update", val );
- var_Set( p_osd, "osd-menu-visible", val );
+ var_SetBool( p_osd, "osd-menu-update", false );
+ var_SetBool( p_osd, "osd-menu-visible", false );
+
+ val.p_address = p_osd;
+ var_Set( p_this->p_libvlc, "osd", val );
}
+ else
+ p_osd = val.p_address;
+ vlc_object_hold( p_osd );
vlc_mutex_unlock( lockval.p_address );
return p_osd;
error:
- msg_Err( p_this, "creating OSD menu object failed" );
-
- if( p_osd->p_image )
- image_HandlerDelete( p_osd->p_image );
- if( p_osd->psz_file )
- free( p_osd->psz_file );
-
- vlc_object_detach( p_osd );
- vlc_object_release( p_osd );
vlc_mutex_unlock( lockval.p_address );
+ __osd_MenuDelete( p_this, p_osd );
return NULL;
}
var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
vlc_mutex_lock( lockval.p_address );
- vlc_object_release( p_osd );
- if( vlc_internals( VLC_OBJECT(p_osd) )->i_refcount > 0 )
+ if( vlc_internals( VLC_OBJECT(p_osd) )->i_refcount == 1 )
{
- vlc_mutex_unlock( lockval.p_address );
- return;
- }
+ vlc_value_t val;
- var_Destroy( p_osd, "osd-menu-visible" );
- var_Destroy( p_osd, "osd-menu-update" );
+ var_Destroy( p_osd, "osd-menu-visible" );
+ var_Destroy( p_osd, "osd-menu-update" );
+ osd_ParserUnload( p_osd );
+ val.p_address = NULL;
+ var_Set( p_this->p_libvlc, "osd", val );
+ }
- osd_ParserUnload( p_osd );
- p_osd = NULL;
+ vlc_object_release( p_osd );
vlc_mutex_unlock( lockval.p_address );
}
+static osd_menu_t *osd_Find( vlc_object_t *p_this )
+{
+ vlc_value_t val;
+
+ if( var_Get( p_this->p_libvlc, "osd", &val ) )
+ return NULL;
+ return val.p_address;
+}
+
/* The volume can be modified in another interface while the OSD Menu
* has not been instantiated yet. This routines updates the "volume OSD menu item"
* to reflect the current state of the GUI.
void __osd_MenuShow( vlc_object_t *p_this )
{
- osd_menu_t *p_osd = NULL;
+ osd_menu_t *p_osd;
osd_button_t *p_button = NULL;
vlc_value_t lockval;
- p_osd = vlc_object_find( p_this, VLC_OBJECT_OSDMENU, FIND_ANYWHERE );
+ var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
+ vlc_mutex_lock( lockval.p_address );
+ p_osd = osd_Find( p_this );
if( p_osd == NULL )
{
- msg_Err( p_this, "osd_MenuNext failed" );
+ vlc_mutex_unlock( lockval.p_address );
+ msg_Err( p_this, "osd_MenuShow failed" );
return;
}
- var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
- vlc_mutex_lock( lockval.p_address );
-
#if defined(OSD_MENU_DEBUG)
msg_Dbg( p_osd, "menu on" );
#endif
}
osd_SetMenuVisible( p_osd, true );
- vlc_object_release( (vlc_object_t*) p_osd );
vlc_mutex_unlock( lockval.p_address );
}
void __osd_MenuHide( vlc_object_t *p_this )
{
- osd_menu_t *p_osd = NULL;
+ osd_menu_t *p_osd;
vlc_value_t lockval;
- p_osd = vlc_object_find( p_this, VLC_OBJECT_OSDMENU, FIND_ANYWHERE );
+ var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
+ vlc_mutex_lock( lockval.p_address );
+
+ p_osd = osd_Find( p_this );
if( p_osd == NULL )
{
- msg_Err( p_this, "osd_MenuNext failed" );
+ vlc_mutex_unlock( lockval.p_address );
+ msg_Err( p_this, "osd_MenuHide failed" );
return;
}
- var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
- vlc_mutex_lock( lockval.p_address );
-
#if defined(OSD_MENU_DEBUG)
msg_Dbg( p_osd, "menu off" );
#endif
0, 0, NULL );
osd_SetMenuUpdate( p_osd, true );
- vlc_object_release( (vlc_object_t*) p_osd );
vlc_mutex_unlock( lockval.p_address );
}
void __osd_MenuActivate( vlc_object_t *p_this )
{
- osd_menu_t *p_osd = NULL;
+ osd_menu_t *p_osd;
osd_button_t *p_button = NULL;
vlc_value_t lockval;
- p_osd = vlc_object_find( p_this, VLC_OBJECT_OSDMENU, FIND_ANYWHERE );
- if( p_osd == NULL )
- {
- msg_Err( p_this, "osd_MenuNext failed" );
- return;
- }
+ var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
+ vlc_mutex_lock( lockval.p_address );
- if( osd_isVisible( p_osd ) == false )
+ p_osd = osd_Find( p_this );
+ if( p_osd == NULL || !osd_isVisible( p_osd ) )
{
- vlc_object_release( (vlc_object_t*) p_osd );
+ vlc_mutex_unlock( lockval.p_address );
+ msg_Err( p_this, "osd_MenuActivate failed" );
return;
}
- var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
- vlc_mutex_lock( lockval.p_address );
-
#if defined(OSD_MENU_DEBUG)
msg_Dbg( p_osd, "select" );
#endif
*/
if( p_button && p_button->p_up )
{
- vlc_object_release( (vlc_object_t*) p_osd );
vlc_mutex_unlock( lockval.p_address );
__osd_MenuUp( p_this ); /* "menu select" means go to menu item above. */
return;
}
if( p_button && p_button->p_down )
{
- vlc_object_release( (vlc_object_t*) p_osd );
vlc_mutex_unlock( lockval.p_address );
__osd_MenuDown( p_this ); /* "menu select" means go to menu item below. */
return;
msg_Dbg( p_osd, "select (%d, %s)", config_GetInt( p_osd, p_button->psz_action ), p_button->psz_action );
#endif
}
- vlc_object_release( (vlc_object_t*) p_osd );
vlc_mutex_unlock( lockval.p_address );
}
void __osd_MenuNext( vlc_object_t *p_this )
{
- osd_menu_t *p_osd = NULL;
+ osd_menu_t *p_osd;
osd_button_t *p_button = NULL;
vlc_value_t lockval;
- p_osd = vlc_object_find( p_this, VLC_OBJECT_OSDMENU, FIND_ANYWHERE );
- if( p_osd == NULL )
- {
- msg_Err( p_this, "osd_MenuNext failed" );
- return;
- }
+ var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
+ vlc_mutex_lock( lockval.p_address );
- if( osd_isVisible( p_osd ) == false )
+ p_osd = osd_Find( p_this );
+ if( p_osd == NULL || !osd_isVisible( p_osd ) )
{
- vlc_object_release( (vlc_object_t*) p_osd );
+ vlc_mutex_unlock( lockval.p_address );
+ msg_Err( p_this, "osd_MenuNext failed" );
return;
}
- var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
- vlc_mutex_lock( lockval.p_address );
-
p_button = p_osd->p_state->p_visible;
if( p_button )
{
msg_Dbg( p_osd, "direction right [button %s]", p_osd->p_state->p_visible->psz_action );
#endif
- vlc_object_release( (vlc_object_t*) p_osd );
vlc_mutex_unlock( lockval.p_address );
}
void __osd_MenuPrev( vlc_object_t *p_this )
{
- osd_menu_t *p_osd = NULL;
+ osd_menu_t *p_osd;
osd_button_t *p_button = NULL;
vlc_value_t lockval;
- p_osd = vlc_object_find( p_this, VLC_OBJECT_OSDMENU, FIND_ANYWHERE );
- if( p_osd == NULL )
+ var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
+ vlc_mutex_lock( lockval.p_address );
+ p_osd = osd_Find( p_this );
+ if( p_osd == NULL || !osd_isVisible( p_osd ) )
{
+ vlc_mutex_unlock( lockval.p_address );
msg_Err( p_this, "osd_MenuPrev failed" );
return;
}
- if( osd_isVisible( p_osd ) == false )
- {
- vlc_object_release( (vlc_object_t*) p_osd );
- return;
- }
-
- var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
- vlc_mutex_lock( lockval.p_address );
-
p_button = p_osd->p_state->p_visible;
if( p_button )
{
msg_Dbg( p_osd, "direction left [button %s]", p_osd->p_state->p_visible->psz_action );
#endif
- vlc_object_release( (vlc_object_t*) p_osd );
vlc_mutex_unlock( lockval.p_address );
}
void __osd_MenuUp( vlc_object_t *p_this )
{
- osd_menu_t *p_osd = NULL;
+ osd_menu_t *p_osd;
osd_button_t *p_button = NULL;
vlc_value_t lockval;
#if defined(OSD_MENU_DEBUG)
vlc_value_t val;
#endif
- p_osd = vlc_object_find( p_this, VLC_OBJECT_OSDMENU, FIND_ANYWHERE );
- if( p_osd == NULL )
- {
- msg_Err( p_this, "osd_MenuDown failed" );
- return;
- }
- if( osd_isVisible( p_osd ) == false )
+ var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
+ vlc_mutex_lock( lockval.p_address );
+ p_osd = osd_Find( p_this );
+ if( p_osd == NULL || !osd_isVisible( p_osd ) )
{
- vlc_object_release( (vlc_object_t*) p_osd );
+ vlc_mutex_unlock( lockval.p_address );
+ msg_Err( p_this, "osd_MenuActivate failed" );
return;
}
- var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
- vlc_mutex_lock( lockval.p_address );
-
p_button = p_osd->p_state->p_visible;
if( p_button )
{
msg_Dbg( p_osd, "direction up [button %s]", p_osd->p_state->p_visible->psz_action );
#endif
- vlc_object_release( (vlc_object_t*) p_osd );
vlc_mutex_unlock( lockval.p_address );
}
void __osd_MenuDown( vlc_object_t *p_this )
{
- osd_menu_t *p_osd = NULL;
+ osd_menu_t *p_osd;
osd_button_t *p_button = NULL;
vlc_value_t lockval;
#if defined(OSD_MENU_DEBUG)
vlc_value_t val;
#endif
- p_osd = vlc_object_find( p_this, VLC_OBJECT_OSDMENU, FIND_ANYWHERE );
- if( p_osd == NULL )
- {
- msg_Err( p_this, "osd_MenuDown failed" );
- return;
- }
+ var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
+ vlc_mutex_lock( lockval.p_address );
- if( osd_isVisible( p_osd ) == false )
+ p_osd = osd_Find( p_this );
+ if( p_osd == NULL || !osd_isVisible( p_osd ) )
{
- vlc_object_release( (vlc_object_t*) p_osd );
+ vlc_mutex_unlock( lockval.p_address );
+ msg_Err( p_this, "osd_MenuActivate failed" );
return;
}
- var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
- vlc_mutex_lock( lockval.p_address );
-
p_button = p_osd->p_state->p_visible;
if( p_button )
{
msg_Dbg( p_osd, "direction down [button %s]", p_osd->p_state->p_visible->psz_action );
#endif
- vlc_object_release( (vlc_object_t*) p_osd );
vlc_mutex_unlock( lockval.p_address );
}
*/
void __osd_Volume( vlc_object_t *p_this )
{
- osd_menu_t *p_osd = NULL;
+ osd_menu_t *p_osd;
osd_button_t *p_button = NULL;
vlc_value_t lockval;
int i_volume = 0;
int i_steps = 0;
- p_osd = vlc_object_find( p_this, VLC_OBJECT_OSDMENU, FIND_ANYWHERE );
+ var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
+ vlc_mutex_lock( lockval.p_address );
+
+ p_osd = osd_Find( p_this );
if( p_osd == NULL )
{
+ vlc_mutex_unlock( lockval.p_address );
msg_Err( p_this, "OSD menu volume update failed" );
return;
}
if( p_osd->p_state && p_osd->p_state->p_volume )
{
- var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
- vlc_mutex_lock( lockval.p_address );
p_button = p_osd->p_state->p_volume;
if( p_osd->p_state->p_volume )
osd_SetMenuUpdate( p_osd, true );
osd_SetMenuVisible( p_osd, true );
}
- vlc_object_release( (vlc_object_t*) p_osd );
- vlc_mutex_unlock( lockval.p_address );
}
+ vlc_mutex_unlock( lockval.p_address );
}
osd_button_t *__osd_ButtonFind( vlc_object_t *p_this, int i_x, int i_y,
osd_button_t *p_button;
vlc_value_t lockval;
- p_osd = vlc_object_find( p_this, VLC_OBJECT_OSDMENU, FIND_ANYWHERE );
- if( p_osd == NULL )
- {
- msg_Err( p_this, "OSD menu button find failed" );
- return NULL;
- }
+ var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
+ vlc_mutex_lock( lockval.p_address );
- if( osd_isVisible( p_osd ) == false )
+ p_osd = osd_Find( p_this );
+ if( p_osd == NULL || !osd_isVisible( p_osd ) )
{
- vlc_object_release( (vlc_object_t*) p_osd );
+ vlc_mutex_unlock( lockval.p_address );
+ msg_Err( p_this, "osd_ButtonFind failed" );
return NULL;
}
- var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
- vlc_mutex_lock( lockval.p_address );
-
p_button = p_osd->p_button;
for( ; p_button != NULL; p_button = p_button->p_next )
{
if( ( i_x >= i_x_offset ) && ( i_x <= i_x_offset + i_width ) &&
( i_y >= i_y_offset ) && ( i_y <= i_y_offset + i_height ) )
{
- vlc_object_release( (vlc_object_t*) p_osd );
vlc_mutex_unlock( lockval.p_address );
return p_button;
}
}
- vlc_object_release( (vlc_object_t*) p_osd );
vlc_mutex_unlock( lockval.p_address );
return NULL;
}
osd_button_t *p_old;
vlc_value_t lockval;
- p_osd = vlc_object_find( p_this, VLC_OBJECT_OSDMENU, FIND_ANYWHERE );
- if( p_osd == NULL )
- {
- msg_Err( p_this, "OSD menu button select failed" );
- return;
- }
+ var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
+ vlc_mutex_lock( lockval.p_address );
- if( osd_isVisible( p_osd ) == false )
+ p_osd = osd_Find( p_this );
+ if( p_osd == NULL || !osd_isVisible( p_osd ) )
{
- vlc_object_release( (vlc_object_t*) p_osd );
+ vlc_mutex_unlock( lockval.p_address );
+ msg_Err( p_this, "osd_ButtonSelect failed" );
return;
}
- var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
- vlc_mutex_lock( lockval.p_address );
-
p_old = p_osd->p_state->p_visible;
if( p_old )
{
msg_Dbg( p_osd, "button selected is [button %s]", p_osd->p_state->p_visible->psz_action );
#endif
- vlc_object_release( (vlc_object_t*) p_osd );
vlc_mutex_unlock( lockval.p_address );
}
projects / vlc / blobdiff