* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <vlc_keys.h>
#include <vlc_osd.h>
#undef OSD_MENU_DEBUG
+#if 0
static const char *ppsz_button_states[] = { "unselect", "select", "pressed" };
+#endif
/*****************************************************************************
* Local prototypes
static int osd_VolumeStep( vlc_object_t *, int, int );
static vlc_bool_t osd_isVisible( osd_menu_t *p_osd );
static osd_menu_t *osd_ParserLoad( vlc_object_t *, const char * );
-static void osd_ParserUnload( vlc_object_t *, osd_menu_t * );
+static void osd_ParserUnload( osd_menu_t * );
static vlc_bool_t osd_isVisible( osd_menu_t *p_osd )
{
if( !p_menu->p_image || !p_menu->psz_file )
{
msg_Err( p_this, "unable to load images, aborting .." );
- osd_ParserUnload( p_this, p_menu );
+ osd_ParserUnload( p_menu );
return NULL;
}
else
char *psz_ext = strrchr( p_menu->psz_file, '.' );
if( psz_ext && !strcmp( psz_ext, ".cfg") )
- psz_type = "import-osd";
+ psz_type = (char*)"import-osd";
else
- psz_type = "import-osd-xml";
+ psz_type = (char*)"import-osd-xml";
p_menu->p_parser = module_Need( p_menu, "osd parser",
psz_type, VLC_TRUE );
if( !p_menu->p_parser )
{
- osd_ParserUnload( p_this, p_menu );
+ osd_ParserUnload( p_menu );
return NULL;
}
}
return p_menu;
}
-static void osd_ParserUnload( vlc_object_t *p_this, osd_menu_t *p_menu )
+static void osd_ParserUnload( osd_menu_t *p_menu )
{
if( p_menu->p_image )
image_HandlerDelete( p_menu->p_image );
module_Unneed( p_menu, p_menu->p_parser );
vlc_object_detach( p_menu );
- vlc_object_destroy( p_menu );
+ vlc_object_release( p_menu );
}
/**
free( p_osd->psz_file );
vlc_object_detach( p_osd );
- vlc_object_destroy( p_osd );
+ vlc_object_release( p_osd );
vlc_mutex_unlock( lockval.p_address );
return NULL;
}
var_Destroy( p_osd, "osd-menu-visible" );
var_Destroy( p_osd, "osd-menu-update" );
- osd_ParserUnload( p_this, p_osd );
+ osd_ParserUnload( p_osd );
p_osd = NULL;
vlc_mutex_unlock( lockval.p_address );
}
int i_scale_width, int i_scale_height )
{
osd_menu_t *p_osd;
- osd_button_t *p_button, *p_start, *p_end;
+ osd_button_t *p_button;
vlc_value_t lockval;
p_osd = vlc_object_find( p_this, VLC_OBJECT_OSDMENU, FIND_ANYWHERE );