Skip to content

V
vlc-gpu
Commit 4ff5e969 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

Fix merge conflicts for src/osd/osd.c

parent 6f7b6bf6
Hide whitespace changes
Inline Side-by-side
Showing with 431 additions and 0 deletions
include/vlc_configuration.h
View file @ 4ff5e969
...@@ -123,6 +123,9 @@ extern "C" { ...@@ -123,6 +123,9 @@ extern "C" {
#define SUBCAT_PLAYLIST_SD 702 #define SUBCAT_PLAYLIST_SD 702
#define SUBCAT_PLAYLIST_EXPORT 703 #define SUBCAT_PLAYLIST_EXPORT 703
#define CAT_OSD 8
#define SUBCAT_OSD_IMPORT 801
struct config_category_t struct config_category_t
{ {
int i_id; int i_id;
......
include/vlc_osd.h
View file @ 4ff5e969
...@@ -395,6 +395,11 @@ struct osd_menu_t ...@@ -395,6 +395,11 @@ struct osd_menu_t
/* quick link in the linked list. */ /* quick link in the linked list. */
osd_button_t *p_last_button; /*< pointer to last button in the list */ osd_button_t *p_last_button; /*< pointer to last button in the list */
/* misc parser */
module_t *p_module; /*< pointer to parser module */
char *psz_file; /*< Config file name */
image_handler_t *p_image; /*< handler to image loading and conversion libraries */
}; };
/** /**
......
modules/misc/osd/Modules.am 0 → 100644
View file @ 4ff5e969
SOURCES_osd_parser = \
parser.c \
simple.c \
osd_menu.c \
osd_menu.h \
xml.c \
$(NULL)
\ No newline at end of file
src/osd/osd_parser.c → modules/misc/osd/osd_menu.c
View file @ 4ff5e969
/***************************************************************************** /*****************************************************************************
* osd_parser.c - The OSD Menu parser core code. * parser.c : OSD import module
***************************************************************************** *****************************************************************************
* Copyright (C) 2005 M2X * Copyright (C) 2007 M2X
* $Id$ * $Id: $
* *
* Authors: Jean-Paul Saman <jpsaman #_at_# m2x dot nl> * Authors: Jean-Paul Saman
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <vlc_osd.h> #include <vlc_osd.h>
#include <vlc_charset.h> #include <vlc_charset.h>
#include "osd_menu.h"
#undef OSD_MENU_DEBUG #undef OSD_MENU_DEBUG
...@@ -42,45 +43,10 @@ ...@@ -42,45 +43,10 @@
*****************************************************************************/ *****************************************************************************/
static const char *ppsz_button_states[] = { "unselect", "select", "pressed" }; static const char *ppsz_button_states[] = { "unselect", "select", "pressed" };
/* OSD Menu structure support routines */
static osd_menu_t *osd_MenuNew( osd_menu_t *, const char *, int, int );
static osd_button_t *osd_ButtonNew( const char *, int, int );
static osd_state_t *osd_StateNew( vlc_object_t *, const char *, const char * );
static void osd_MenuFree ( vlc_object_t *, osd_menu_t * );
static void osd_ButtonFree( vlc_object_t *, osd_button_t * );
static void osd_StatesFree( vlc_object_t *, osd_state_t * );
static picture_t *osd_LoadImage( vlc_object_t *, const char *);
/*****************************************************************************
* osd_LoadImage: loads the logo image into memory
*****************************************************************************/
static picture_t *osd_LoadImage( vlc_object_t *p_this, const char *psz_filename )
{
picture_t *p_pic = NULL;
image_handler_t *p_image;
video_format_t fmt_in, fmt_out;
memset( &fmt_in, 0, sizeof(video_format_t) );
memset( &fmt_out, 0, sizeof(video_format_t) );
fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A');
p_image = image_HandlerCreate( p_this );
if( p_image )
{
p_pic = image_ReadUrl( p_image, psz_filename, &fmt_in, &fmt_out );
image_HandlerDelete( p_image );
}
else msg_Err( p_this, "unable to handle this chroma" );
return p_pic;
}
/***************************************************************************** /*****************************************************************************
* Create a new Menu structure * Create a new Menu structure
*****************************************************************************/ *****************************************************************************/
static osd_menu_t *osd_MenuNew( osd_menu_t *p_menu, const char *psz_path, int i_x, int i_y ) osd_menu_t *osd_MenuNew( osd_menu_t *p_menu, const char *psz_path, int i_x, int i_y )
{ {
if( !p_menu ) return NULL; if( !p_menu ) return NULL;
...@@ -106,7 +72,7 @@ static osd_menu_t *osd_MenuNew( osd_menu_t *p_menu, const char *psz_path, int i_ ...@@ -106,7 +72,7 @@ static osd_menu_t *osd_MenuNew( osd_menu_t *p_menu, const char *psz_path, int i_
/***************************************************************************** /*****************************************************************************
* Free the menu * Free the menu
*****************************************************************************/ *****************************************************************************/
static void osd_MenuFree( vlc_object_t *p_this, osd_menu_t *p_menu ) void osd_MenuFree( vlc_object_t *p_this, osd_menu_t *p_menu )
{ {
msg_Dbg( p_this, "freeing menu" ); msg_Dbg( p_this, "freeing menu" );
osd_ButtonFree( p_this, p_menu->p_button ); osd_ButtonFree( p_this, p_menu->p_button );
...@@ -121,7 +87,7 @@ static void osd_MenuFree( vlc_object_t *p_this, osd_menu_t *p_menu ) ...@@ -121,7 +87,7 @@ static void osd_MenuFree( vlc_object_t *p_this, osd_menu_t *p_menu )
/***************************************************************************** /*****************************************************************************
* Create a new button * Create a new button
*****************************************************************************/ *****************************************************************************/
static osd_button_t *osd_ButtonNew( const char *psz_action, int i_x, int i_y ) osd_button_t *osd_ButtonNew( const char *psz_action, int i_x, int i_y )
{ {
osd_button_t *p_button = NULL; osd_button_t *p_button = NULL;
p_button = (osd_button_t*) malloc( sizeof(osd_button_t) ); p_button = (osd_button_t*) malloc( sizeof(osd_button_t) );
...@@ -141,7 +107,7 @@ static osd_button_t *osd_ButtonNew( const char *psz_action, int i_x, int i_y ) ...@@ -141,7 +107,7 @@ static osd_button_t *osd_ButtonNew( const char *psz_action, int i_x, int i_y )
/***************************************************************************** /*****************************************************************************
* Free a button * Free a button
*****************************************************************************/ *****************************************************************************/
static void osd_ButtonFree( vlc_object_t *p_this, osd_button_t *p_button ) void osd_ButtonFree( vlc_object_t *p_this, osd_button_t *p_button )
{ {
osd_button_t *p_current = p_button; osd_button_t *p_current = p_button;
osd_button_t *p_next = NULL; osd_button_t *p_next = NULL;
...@@ -239,24 +205,39 @@ static void osd_ButtonFree( vlc_object_t *p_this, osd_button_t *p_button ) ...@@ -239,24 +205,39 @@ static void osd_ButtonFree( vlc_object_t *p_this, osd_button_t *p_button )
/***************************************************************************** /*****************************************************************************
* Create a new state image * Create a new state image
*****************************************************************************/ *****************************************************************************/
static osd_state_t *osd_StateNew( vlc_object_t *p_this, const char *psz_file, const char *psz_state ) osd_state_t *osd_StateNew( vlc_object_t *p_this, const char *psz_file, const char *psz_state )
{ {
osd_menu_t *p_this;
osd_state_t *p_state = NULL; osd_state_t *p_state = NULL;
video_format_t fmt_in, fmt_out;
p_state = (osd_state_t*) malloc( sizeof(osd_state_t) ); p_state = (osd_state_t*) malloc( sizeof(osd_state_t) );
if( !p_state ) if( !p_state )
return NULL; return NULL;
memset( p_state, 0, sizeof(osd_state_t) ); memset( p_state, 0, sizeof(osd_state_t) );
p_state->p_pic = osd_LoadImage( p_this, psz_file );
memset( &fmt_in, 0, sizeof(video_format_t) );
memset( &fmt_out, 0, sizeof(video_format_t) );
fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A');
if( p_osd->p_image )
{
p_state->p_pic = image_ReadUrl( p_osd->p_image, p_osd->psz_file,
&fmt_in, &fmt_out );
}
if( psz_state ) if( psz_state )
{ {
p_state->psz_state = strdup( psz_state ); p_state->psz_state = strdup( psz_state );
if( strncmp( ppsz_button_states[0], psz_state, strlen(ppsz_button_states[0]) ) == 0 ) if( strncmp( ppsz_button_states[0], psz_state,
strlen(ppsz_button_states[0]) ) == 0 )
p_state->i_state = OSD_BUTTON_UNSELECT; p_state->i_state = OSD_BUTTON_UNSELECT;
else if( strncmp( ppsz_button_states[1], psz_state, strlen(ppsz_button_states[1]) ) == 0 ) else if( strncmp( ppsz_button_states[1], psz_state,
strlen(ppsz_button_states[1]) ) == 0 )
p_state->i_state = OSD_BUTTON_SELECT; p_state->i_state = OSD_BUTTON_SELECT;
else if( strncmp( ppsz_button_states[2], psz_state, strlen(ppsz_button_states[2]) ) == 0 ) else if( strncmp( ppsz_button_states[2], psz_state,
strlen(ppsz_button_states[2]) ) == 0 )
p_state->i_state = OSD_BUTTON_PRESSED; p_state->i_state = OSD_BUTTON_PRESSED;
} }
return p_state; return p_state;
...@@ -265,7 +246,7 @@ static osd_state_t *osd_StateNew( vlc_object_t *p_this, const char *psz_file, co ...@@ -265,7 +246,7 @@ static osd_state_t *osd_StateNew( vlc_object_t *p_this, const char *psz_file, co
/***************************************************************************** /*****************************************************************************
* Free state images * Free state images
*****************************************************************************/ *****************************************************************************/
static void osd_StatesFree( vlc_object_t *p_this, osd_state_t *p_states ) void osd_StatesFree( vlc_object_t *p_this, osd_state_t *p_states )
{ {
osd_state_t *p_state = p_states; osd_state_t *p_state = p_states;
osd_state_t *p_next = NULL; osd_state_t *p_next = NULL;
...@@ -308,434 +289,3 @@ static void osd_StatesFree( vlc_object_t *p_this, osd_state_t *p_states ) ...@@ -308,434 +289,3 @@ static void osd_StatesFree( vlc_object_t *p_this, osd_state_t *p_states )
p_states = NULL; p_states = NULL;
} }
} }
/*****************************************************************************
* osd_ConfigLoader: Load and parse osd text configurationfile
*****************************************************************************/
int osd_ConfigLoader( vlc_object_t *p_this, const char *psz_file,
osd_menu_t **p_menu )
{
osd_button_t *p_current = NULL; /* button currently processed */
osd_button_t *p_prev = NULL; /* previous processed button */
#define MAX_FILE_PATH 256
FILE *fd = NULL;
int result = 0;
msg_Dbg( p_this, "opening osdmenu definition file %s", psz_file );
fd = utf8_fopen( psz_file, "r" );
if( !fd )
{
msg_Err( p_this, "failed to open osdmenu definition file %s", psz_file );
return VLC_EGENERIC;
}
/* Read first line */
if( !feof( fd ) )
{
char action[25] = "";
char cmd[25] = "";
char path[MAX_FILE_PATH] = "";
char *psz_path = NULL;
size_t i_len = 0;
long pos = 0;
result = fscanf(fd, "%24s %255s", &action[0], &path[0] );
/* override images path ? */
psz_path = config_GetPsz( p_this, "osdmenu-file-path" );
if( psz_path )
{
/* psz_path is not null and therefor &path[0] cannot be NULL
* it might be null terminated.
*/
strncpy( &path[0], psz_path, MAX_FILE_PATH );
free( psz_path );
psz_path = NULL;
}
/* NULL terminate before asking the length of path[] */
path[MAX_FILE_PATH-1] = '\0';
i_len = strlen(&path[0]);
if( i_len == MAX_FILE_PATH )
i_len--; /* truncate to prevent buffer overflow */
#if defined(WIN32) || defined(UNDER_CE)
if( (i_len > 0) && path[i_len] != '\\' )
path[i_len] = '\\';
#else
if( (i_len > 0) && path[i_len] != '/' )
path[i_len] = '/';
#endif
path[i_len+1] = '\0';
if( result == 0 || result == EOF )
goto error;
msg_Dbg( p_this, "osdmenu dir %s", &path[0] );
if( i_len == 0 )
*p_menu = osd_MenuNew( *p_menu, NULL, 0, 0 );
else
*p_menu = osd_MenuNew( *p_menu, &path[0], 0, 0 );
/* Peek for 'style' argument */
pos = ftell( fd );
if( pos < 0 )
goto error;
result = fscanf(fd, "%24s %24s", &cmd[0], &action[0] );
if( result == 0 || result == EOF )
goto error;
msg_Dbg( p_this, "osdmenu %s %s", &cmd[0], &action[0] );
if( strncmp( &cmd[0], "style", 5 ) == 0 )
{
if( strncmp( &action[0], "default", 7) == 0 )
{
(*p_menu)->i_style = OSD_MENU_STYLE_SIMPLE;
}
else if( strncmp( &action[0], "concat", 6) == 0 )
{
(*p_menu)->i_style = OSD_MENU_STYLE_CONCAT;
}
}
else
{
result = fseek( fd, pos, SEEK_SET );
if( result < 0 )
goto error;
}
}
if( !*p_menu )
goto error;
/* read successive lines */
while( !feof( fd ) )
{
osd_state_t *p_state_current = NULL; /* button state currently processed */
osd_state_t *p_state_prev = NULL; /* previous state processed button */
char cmd[25] = "";
char action[25] = "";
char state[25] = "";
char file[256] = "";
char path[512] = "";
int i_x = 0;
int i_y = 0;
result = fscanf( fd, "%24s %24s (%d,%d)", &cmd[0], &action[0], &i_x, &i_y );
if( result == 0 )
goto error;
if( strncmp( &cmd[0], "action", 6 ) != 0 )
break;
msg_Dbg( p_this, " + %s hotkey=%s (%d,%d)", &cmd[0], &action[0], i_x, i_y );
p_prev = p_current;
p_current = osd_ButtonNew( &action[0], i_x, i_y );
if( !p_current )
goto error;
if( p_prev )
p_prev->p_next = p_current;
else
(*p_menu)->p_button = p_current;
p_current->p_prev = p_prev;
/* parse all states */
while( !feof( fd ) )
{
char type[25] = "";
result = fscanf( fd, "\t%24s", &state[0] );
if( result == 0 )
goto error;
/* FIXME: We only parse one level deep now */
if( strncmp( &state[0], "action", 6 ) == 0 )
{
osd_button_t *p_up = NULL;
result = fscanf( fd, "%24s (%d,%d)", &action[0], &i_x, &i_y );
if( result == 0 )
goto error;
/* create new button */
p_up = osd_ButtonNew( &action[0], i_x, i_y );
if( !p_up )
goto error;
/* Link to list */
p_up->p_down = p_current;
p_current->p_up = p_up;
msg_Dbg( p_this, " + (menu up) hotkey=%s (%d,%d)", &action[0], i_x, i_y );
/* Parse type state */
result = fscanf( fd, "\t%24s %24s", &cmd[0], &type[0] );
if( result == 0 )
goto error;
if( strncmp( &cmd[0], "type", 4 ) == 0 )
{
if( strncmp( &type[0], "volume", 6 ) == 0 )
{
(*p_menu)->p_state->p_volume = p_up;
msg_Dbg( p_this, " + type=%s", &type[0] );
}
}
/* Parse range state */
result = fscanf( fd, "\t%24s", &state[0] );
if( result == 0 )
goto error;
/* Parse the range state */
if( strncmp( &state[0], "range", 5 ) == 0 )
{
osd_state_t *p_range_current = NULL; /* range state currently processed */
osd_state_t *p_range_prev = NULL; /* previous state processed range */
int i_index = 0;
p_up->b_range = VLC_TRUE;
result = fscanf( fd, "\t%24s", &action[0] );
if( result == 0 )
goto error;
result = fscanf( fd, "\t%d", &i_index );
if( result == 0 )
goto error;
msg_Dbg( p_this, " + (menu up) hotkey down %s, file=%s%s", &action[0], (*p_menu)->psz_path, &file[0] );
if( p_up->psz_action_down ) free( p_up->psz_action_down );
p_up->psz_action_down = strdup( &action[0] );
/* Parse range contstruction :
* range <hotkey>
* <state1> <file1>
*
* <stateN> <fileN>
* end
*/
while( !feof( fd ) )
{
result = fscanf( fd, "\t%255s", &file[0] );
if( result == 0 )
goto error;
if( strncmp( &file[0], "end", 3 ) == 0 )
break;
p_range_prev = p_range_current;
if( (*p_menu)->psz_path )
{
size_t i_path_size = strlen( (*p_menu)->psz_path );
size_t i_file_size = strlen( &file[0] );
strncpy( &path[0], (*p_menu)->psz_path, i_path_size );
strncpy( &path[i_path_size], &file[0], 512 - (i_path_size + i_file_size) );
path[ i_path_size + i_file_size ] = '\0';
p_range_current = osd_StateNew( p_this, &path[0], "pressed" );
}
else /* absolute paths are used. */
p_range_current = osd_StateNew( p_this, &file[0], "pressed" );
if( !p_range_current || !p_range_current->p_pic )
goto error;
/* increment the number of ranges for this button */
p_up->i_ranges++;
if( p_range_prev )
p_range_prev->p_next = p_range_current;
else
p_up->p_states = p_range_current;
p_range_current->p_prev = p_range_prev;
msg_Dbg( p_this, " |- range=%d, file=%s%s",
p_up->i_ranges,
(*p_menu)->psz_path, &file[0] );
}
if( i_index > 0 )
{
osd_state_t *p_range = NULL;
/* Find the default index for state range */
p_range = p_up->p_states;
while( (--i_index > 0) && p_range->p_next )
{
osd_state_t *p_temp = NULL;
p_temp = p_range->p_next;
p_range = p_temp;
}
p_up->p_current_state = p_range;
}
else p_up->p_current_state = p_up->p_states;
}
result = fscanf( fd, "\t%24s", &state[0] );
if( result == 0 )
goto error;
if( strncmp( &state[0], "end", 3 ) != 0 )
goto error;
/* Continue at the beginning of the while() */
continue;
}
/* Parse the range state */
if( strncmp( &state[0], "range", 5 ) == 0 )
{
osd_state_t *p_range_current = NULL; /* range state currently processed */
osd_state_t *p_range_prev = NULL; /* previous state processed range */
int i_index = 0;
p_current->b_range = VLC_TRUE;
result = fscanf( fd, "\t%24s", &action[0] );
if( result == 0 )
goto error;
result = fscanf( fd, "\t%d", &i_index );
if( result == 0 )
goto error;
msg_Dbg( p_this, " + hotkey down %s, file=%s%s", &action[0], (*p_menu)->psz_path, &file[0] );
if( p_current->psz_action_down ) free( p_current->psz_action_down );
p_current->psz_action_down = strdup( &action[0] );
/* Parse range contstruction :
* range <hotkey>
* <state1> <file1>
*
* <stateN> <fileN>
* end
*/
while( !feof( fd ) )
{
result = fscanf( fd, "\t%255s", &file[0] );
if( result == 0 )
goto error;
if( strncmp( &file[0], "end", 3 ) == 0 )
break;
p_range_prev = p_range_current;
if( (*p_menu)->psz_path )
{
size_t i_path_size = strlen( (*p_menu)->psz_path );
size_t i_file_size = strlen( &file[0] );
strncpy( &path[0], (*p_menu)->psz_path, i_path_size );
strncpy( &path[i_path_size], &file[0], 512 - (i_path_size + i_file_size) );
path[ i_path_size + i_file_size ] = '\0';
p_range_current = osd_StateNew( p_this, &path[0], "pressed" );
}
else /* absolute paths are used. */
p_range_current = osd_StateNew( p_this, &file[0], "pressed" );
if( !p_range_current || !p_range_current->p_pic )
goto error;
/* increment the number of ranges for this button */
p_current->i_ranges++;
if( p_range_prev )
p_range_prev->p_next = p_range_current;
else
p_current->p_states = p_range_current;
p_range_current->p_prev = p_range_prev;
msg_Dbg( p_this, " |- range=%d, file=%s%s",
p_current->i_ranges,
(*p_menu)->psz_path, &file[0] );
}
if( i_index > 0 )
{
osd_state_t *p_range = NULL;
/* Find the default index for state range */
p_range = p_current->p_states;
while( (--i_index > 0) && p_range->p_next )
{
osd_state_t *p_temp = NULL;
p_temp = p_range->p_next;
p_range = p_temp;
}
p_current->p_current_state = p_range;
}
else p_current->p_current_state = p_current->p_states;
/* Continue at the beginning of the while() */
continue;
}
if( strncmp( &state[0], "end", 3 ) == 0 )
break;
result = fscanf( fd, "\t%255s", &file[0] );
if( result == 0 )
goto error;
p_state_prev = p_state_current;
if( ( strncmp( ppsz_button_states[0], &state[0], strlen(ppsz_button_states[0]) ) != 0 ) &&
( strncmp( ppsz_button_states[1], &state[0], strlen(ppsz_button_states[1]) ) != 0 ) &&
( strncmp( ppsz_button_states[2], &state[0], strlen(ppsz_button_states[2]) ) != 0 ) )
{
msg_Err( p_this, "invalid button state %s for button %s "
"expected %u: unselect, select or pressed)",
&state[0], &action[0], (unsigned)strlen(&state[0]));
goto error;
}
if( (*p_menu)->psz_path )
{
size_t i_path_size = strlen( (*p_menu)->psz_path );
size_t i_file_size = strlen( &file[0] );
strncpy( &path[0], (*p_menu)->psz_path, i_path_size );
strncpy( &path[i_path_size], &file[0], 512 - (i_path_size + i_file_size) );
path[ i_path_size + i_file_size ] = '\0';
p_state_current = osd_StateNew( p_this, &path[0], &state[0] );
}
else /* absolute paths are used. */
p_state_current = osd_StateNew( p_this, &file[0], &state[0] );
if( !p_state_current || !p_state_current->p_pic )
goto error;
if( p_state_prev )
p_state_prev->p_next = p_state_current;
else
p_current->p_states = p_state_current;
p_state_current->p_prev = p_state_prev;
msg_Dbg( p_this, " |- state=%s, file=%s%s", &state[0], (*p_menu)->psz_path, &file[0] );
}
p_current->p_current_state = p_current->p_states;
}
/* Find the last button and store its pointer.
* The OSD menu behaves like a roundrobin list.
*/
p_current = (*p_menu)->p_button;
while( p_current && p_current->p_next )
{
osd_button_t *p_temp = NULL;
p_temp = p_current->p_next;
p_current = p_temp;
}
(*p_menu)->p_last_button = p_current;
fclose( fd );
return 0;
#undef MAX_FILE_PATH
error:
msg_Err( p_this, "parsing file failed (returned %d)", result );
osd_MenuFree( p_this, *p_menu );
fclose( fd );
return 1;
}
/*****************************************************************************
* osd_ConfigUnload: Load and parse osd text configurationfile
*****************************************************************************/
void osd_ConfigUnload( vlc_object_t *p_this, osd_menu_t **p_osd)
{
msg_Dbg( p_this, "unloading OSD menu structure" );
osd_MenuFree( p_this, *p_osd );
}
modules/misc/osd/osd_menu.h 0 → 100644
View file @ 4ff5e969
/*****************************************************************************
* parser.c : OSD import module
*****************************************************************************
* Copyright (C) 2007 M2X
* $Id: $
*
* Authors: Jean-Paul Saman
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef _OSD_MENU_PARSER_H_
#define _OSD_MENU_PARSER_H_
/* OSD Menu structure support routines for internal use by
* OSD Menu configuration file parsers only.
*/
osd_menu_t *osd_MenuNew( osd_menu_t *, const char *, int, int );
osd_button_t *osd_ButtonNew( const char *, int, int );
osd_state_t *osd_StateNew( vlc_object_t *, const char *, const char * );
void osd_MenuFree ( vlc_object_t *, osd_menu_t * );
void osd_ButtonFree( vlc_object_t *, osd_button_t * );
void osd_StatesFree( vlc_object_t *, osd_state_t * );
#endif
\ No newline at end of file
modules/misc/osd/parser.c 0 → 100644
View file @ 4ff5e969
/*****************************************************************************
* parser.c : OSD import module
*****************************************************************************
* Copyright (C) 2007 M2X
* $Id: $
*
* Authors: Jean-Paul Saman
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#include <vlc/vlc.h>
#include <vlc_vout.h>
#include <vlc_config.h>
#include <vlc_keys.h>
#include <vlc_image.h>
#include <vlc_osd.h>
#include <vlc_charset.h>
#include "osd_menu.h"
/***************************************************************************
* Prototypes
***************************************************************************/
int osd_parser_simpleOpen ( vlc_object_t *p_this );
void osd_parser_simpleClose( vlc_object_t *p_this );
int osd_parser_xmlOpen ( vlc_object_t *p_this );
void osd_parser_xmlClose ( vlc_object_t *p_this );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_category( CAT_MISC );
set_subcategory( SUBCAT_OSD_IMPORT );
add_submodule();
set_description( _("OSD configuration importer") );
add_shortcut( "import-osd" );
set_capability( "osd parser" , 0);
set_callbacks( osd_parser_simpleOpen, osd_parser_simpleClose );
add_submodule();
set_description( _("XML OSD configuration importer") );
add_shortcut( "import-osd-xml" );
set_capability( "osd parser" , 0);
set_callbacks( osd_parser_xmlOpen, osd_parser_xmlClose );
vlc_module_end();
src/osd/osd.c
View file @ 4ff5e969
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <vlc_keys.h> #include <vlc_keys.h>
#include <vlc_osd.h> #include <vlc_osd.h>
#include "libvlc.h" #include "libvlc.h"
#include <vlc_image.h>
#undef OSD_MENU_DEBUG #undef OSD_MENU_DEBUG
...@@ -77,6 +78,12 @@ osd_menu_t *__osd_MenuCreate( vlc_object_t *p_this, const char *psz_file ) ...@@ -77,6 +78,12 @@ osd_menu_t *__osd_MenuCreate( vlc_object_t *p_this, const char *psz_file )
return NULL; return NULL;
} }
/* Stuff needed for Parser */
p_osd->p_image = image_HandlerCreate( p_this );
if( !p_osd->p_image )
msg_Err( p_this, "unable to load images" );
p_osd->psz_file = strdup( psz_file );
/* Parse configuration file */ /* Parse configuration file */
if( osd_ConfigLoader( p_this, psz_file, &p_osd ) ) if( osd_ConfigLoader( p_this, psz_file, &p_osd ) )
goto error; goto error;
...@@ -116,6 +123,13 @@ osd_menu_t *__osd_MenuCreate( vlc_object_t *p_this, const char *psz_file ) ...@@ -116,6 +123,13 @@ osd_menu_t *__osd_MenuCreate( vlc_object_t *p_this, const char *psz_file )
error: error:
msg_Err( p_this, "creating OSD menu object failed" ); 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_mutex_unlock( lockval.p_address );
vlc_object_destroy( p_osd ); vlc_object_destroy( p_osd );
vlc_mutex_unlock( lockval.p_address ); vlc_mutex_unlock( lockval.p_address );
return NULL; return NULL;
...@@ -141,6 +155,12 @@ void __osd_MenuDelete( vlc_object_t *p_this, osd_menu_t *p_osd ) ...@@ -141,6 +155,12 @@ void __osd_MenuDelete( vlc_object_t *p_this, osd_menu_t *p_osd )
var_Destroy( p_osd, "osd-menu-update" ); var_Destroy( p_osd, "osd-menu-update" );
osd_ConfigUnload( p_this, &p_osd ); osd_ConfigUnload( p_this, &p_osd );
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_detach( p_osd );
vlc_object_destroy( p_osd ); vlc_object_destroy( p_osd );
p_osd = NULL; p_osd = NULL;
......
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