Commit aaf55bf8 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Create OSD menu as a custom object

parent 1e8999a2
...@@ -53,7 +53,6 @@ ...@@ -53,7 +53,6 @@
#include "vlc_codec.h" #include "vlc_codec.h"
#include "vlc_filter.h" #include "vlc_filter.h"
#include "vlc_osd.h"
#include "vlc_meta.h" #include "vlc_meta.h"
#include "variables.h" #include "variables.h"
...@@ -310,10 +309,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type ) ...@@ -310,10 +309,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
i_size = sizeof( announce_handler_t ); i_size = sizeof( announce_handler_t );
psz_type = "announce"; psz_type = "announce";
break; break;
case VLC_OBJECT_OSDMENU:
i_size = sizeof( osd_menu_t );
psz_type = "osd menu";
break;
case VLC_OBJECT_INTERACTION: case VLC_OBJECT_INTERACTION:
i_size = sizeof( interaction_t ); i_size = sizeof( interaction_t );
psz_type = "interaction"; psz_type = "interaction";
......
...@@ -67,8 +67,10 @@ static vlc_bool_t osd_isVisible( osd_menu_t *p_osd ) ...@@ -67,8 +67,10 @@ static vlc_bool_t osd_isVisible( osd_menu_t *p_osd )
static osd_menu_t *osd_ParserLoad( vlc_object_t *p_this, const char *psz_file ) static osd_menu_t *osd_ParserLoad( vlc_object_t *p_this, const char *psz_file )
{ {
osd_menu_t *p_menu; osd_menu_t *p_menu;
static const char osdmenu_name[] = "osd menu";
p_menu = vlc_object_create( p_this, VLC_OBJECT_OSDMENU ); p_menu = vlc_custom_create( p_this, sizeof( *p_menu ), VLC_OBJECT_OSDMENU,
osdmenu_name );
if( !p_menu ) if( !p_menu )
{ {
msg_Err( p_this, "out of memory" ); msg_Err( p_this, "out of memory" );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment