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

osd_parser/osdmenu: remove dead plugins

parent 03c911f3
...@@ -186,7 +186,6 @@ Section $Name_Section01 SEC01 ...@@ -186,7 +186,6 @@ Section $Name_Section01 SEC01
!insertmacro InstallFolder plugins !insertmacro InstallFolder plugins
!insertmacro InstallFolder locale !insertmacro InstallFolder locale
!insertmacro InstallFolder sdk !insertmacro InstallFolder sdk
@BUILD_OSDMENU_TRUE@ !insertmacro InstallFolder osdmenu
@BUILD_SKINS_TRUE@ !insertmacro InstallFolder skins @BUILD_SKINS_TRUE@ !insertmacro InstallFolder skins
@BUILD_LUA_TRUE@ !insertmacro InstallFolder lua @BUILD_LUA_TRUE@ !insertmacro InstallFolder lua
......
...@@ -54,14 +54,6 @@ if BUILD_SKINS ...@@ -54,14 +54,6 @@ if BUILD_SKINS
cp -r $(prefix)/share/vlc/skins2 $(win32_destdir)/skins cp -r $(prefix)/share/vlc/skins2 $(win32_destdir)/skins
endif endif
if BUILD_OSDMENU
cp -r $(prefix)/share/vlc/osdmenu "$(win32_destdir)/"
for file in $(win32_destdir)/osdmenu/*.cfg; do \
sed -e 's%share/osdmenu%osdmenu%g' -e 's%/%\\%g' "$$file" > "$${file}.tmp"; \
mv -f "$${file}.tmp" "$${file}"; \
done
endif
cp "$(top_builddir)/npapi-vlc/activex/axvlc.dll.manifest" "$(win32_destdir)/" cp "$(top_builddir)/npapi-vlc/activex/axvlc.dll.manifest" "$(win32_destdir)/"
cp "$(top_builddir)/npapi-vlc/installed/lib/axvlc.dll" "$(win32_destdir)/" cp "$(top_builddir)/npapi-vlc/installed/lib/axvlc.dll" "$(win32_destdir)/"
cp "$(top_builddir)/npapi-vlc/npapi/package/npvlc.dll.manifest" "$(win32_destdir)/" cp "$(top_builddir)/npapi-vlc/npapi/package/npvlc.dll.manifest" "$(win32_destdir)/"
......
...@@ -232,8 +232,6 @@ $Id$ ...@@ -232,8 +232,6 @@ $Id$
* opensles_android: OpenSL ES audio output for Android * opensles_android: OpenSL ES audio output for Android
* opus: a opus audio decoder/packetizer using the libopus library * opus: a opus audio decoder/packetizer using the libopus library
* os2drive: service discovery for OS/2 drives * os2drive: service discovery for OS/2 drives
* osd_parser: OSD import module
* osdmenu: video_filter for displaying and streaming a On Screen Display menu
* oss: audio output module using the OSS /dev/dsp interface * oss: audio output module using the OSS /dev/dsp interface
* packetizer_copy: Simple copy packetizer * packetizer_copy: Simple copy packetizer
* packetizer_dirac: Dirac video packetizer * packetizer_dirac: Dirac video packetizer
......
...@@ -21,14 +21,6 @@ endif ...@@ -21,14 +21,6 @@ endif
EXTRA_LTLIBRARIES += libgnutls_plugin.la EXTRA_LTLIBRARIES += libgnutls_plugin.la
libvlc_LTLIBRARIES += $(LTLIBgnutls) libvlc_LTLIBRARIES += $(LTLIBgnutls)
libosd_parser_plugin_la_SOURCES = \
osd/parser.c osd/osd_menu.c osd/osd_menu.h osd/simple.c osd/xml.c
libosd_parser_plugin_la_CFLAGS = $(AM_CFLAGS)
libosd_parser_plugin_la_LIBADD = $(AM_LIBADD)
if BUILD_OSDMENU
libvlc_LTLIBRARIES += libosd_parser_plugin.la
endif
libxdg_screensaver_plugin_la_SOURCES = inhibit/xdg.c libxdg_screensaver_plugin_la_SOURCES = inhibit/xdg.c
libxdg_screensaver_plugin_la_CFLAGS = $(AM_CFLAGS) libxdg_screensaver_plugin_la_CFLAGS = $(AM_CFLAGS)
libxdg_screensaver_plugin_la_LIBADD = $(AM_LIBADD) libxdg_screensaver_plugin_la_LIBADD = $(AM_LIBADD)
......
/*****************************************************************************
* osd_menu.c : OSD import module
*****************************************************************************
* Copyright (C) 2007-2008 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
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc_common.h>
#include <vlc_image.h>
#include <vlc_osd.h>
#include "osd_menu.h"
#undef OSD_MENU_DEBUG
const char * const ppsz_button_states[] = { "unselect", "select", "pressed" };
/*****************************************************************************
* Local prototypes
*****************************************************************************/
/*****************************************************************************
* Create a new Menu structure
*****************************************************************************/
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;
p_menu->p_state = calloc( 1, sizeof( osd_menu_state_t ) );
if( !p_menu->p_state )
return NULL;
p_menu->psz_path = psz_path ? strdup( psz_path ) : NULL;
p_menu->i_x = i_x;
p_menu->i_y = i_y;
p_menu->i_style = OSD_MENU_STYLE_SIMPLE;
return p_menu;
}
/*****************************************************************************
* Free the menu
*****************************************************************************/
void osd_MenuFree( osd_menu_t *p_menu )
{
msg_Dbg( p_menu, "freeing menu" );
osd_ButtonFree( p_menu, p_menu->p_button );
free( p_menu->psz_path );
free( p_menu->p_state );
p_menu->p_button = NULL;
p_menu->p_last_button = NULL;
p_menu->psz_path = NULL;
p_menu->p_state = NULL;
}
/*****************************************************************************
* Create a new button
*****************************************************************************/
osd_button_t *osd_ButtonNew( const char *psz_action, int i_x, int i_y )
{
osd_button_t *p_button = NULL;
p_button = calloc( 1, sizeof(osd_button_t) );
if( !p_button )
return NULL;
p_button->psz_action = strdup(psz_action);
p_button->psz_action_down = NULL;
p_button->i_x = i_x;
p_button->i_y = i_y;
return p_button;
}
/*****************************************************************************
* Free a button
*****************************************************************************/
void osd_ButtonFree( osd_menu_t *p_menu, osd_button_t *p_button )
{
osd_button_t *p_current = p_button;
osd_button_t *p_next = NULL;
osd_button_t *p_prev = NULL;
if( !p_current ) return;
/* First walk to the end. */
while( p_current->p_next )
{
p_next = p_current->p_next;
p_current = p_next;
}
/* Then free end first and walk to the start. */
while( p_current->p_prev )
{
msg_Dbg( p_menu, "+ freeing button %s [%p]",
p_current->psz_action, p_current );
p_prev = p_current->p_prev;
p_current = p_prev;
if( p_current->p_next )
{
free( p_current->p_next->psz_name );
free( p_current->p_next->psz_action );
free( p_current->p_next->psz_action_down );
/* Free all states first */
if( p_current->p_next->p_states )
osd_StatesFree( p_menu, p_current->p_next->p_states );
free( p_current->p_next );
p_current->p_next = NULL;
}
if( p_current->p_up )
{
free( p_current->p_up->psz_name );
free( p_current->p_up->psz_action );
free( p_current->p_up->psz_action_down );
/* Free all states first */
if( p_current->p_up->p_states )
osd_StatesFree( p_menu, p_current->p_up->p_states );
free( p_current->p_up );
p_current->p_up = NULL;
}
}
/* Free the last one. */
if( p_button )
{
msg_Dbg( p_menu, "+ freeing button %s [%p]",
p_button->psz_action, p_button );
free( p_button->psz_name );
free( p_button->psz_action );
free( p_button->psz_action_down );
if( p_button->p_states )
osd_StatesFree( p_menu, p_button->p_states );
free( p_button );
}
}
/*****************************************************************************
* Create a new state image
*****************************************************************************/
osd_state_t *osd_StateNew( osd_menu_t *p_menu, const char *psz_file,
const char *psz_state )
{
osd_state_t *p_state = NULL;
video_format_t fmt_in, fmt_out;
p_state = calloc( 1, sizeof(osd_state_t) );
if( !p_state )
return NULL;
memset( &fmt_in, 0, sizeof(video_format_t) );
memset( &fmt_out, 0, sizeof(video_format_t) );
fmt_out.i_chroma = VLC_CODEC_YUVA;
if( p_menu->p_image )
{
p_state->p_pic = image_ReadUrl( p_menu->p_image, psz_file,
&fmt_in, &fmt_out );
if( p_state->p_pic )
{
p_state->i_width = p_state->p_pic->p[Y_PLANE].i_visible_pitch;
p_state->i_height = p_state->p_pic->p[Y_PLANE].i_visible_lines;
}
}
if( psz_state )
{
p_state->psz_state = strdup( psz_state );
if( strncmp( ppsz_button_states[0], psz_state,
strlen(ppsz_button_states[0]) ) == 0 )
p_state->i_state = OSD_BUTTON_UNSELECT;
else if( strncmp( ppsz_button_states[1], psz_state,
strlen(ppsz_button_states[1]) ) == 0 )
p_state->i_state = OSD_BUTTON_SELECT;
else if( strncmp( ppsz_button_states[2], psz_state,
strlen(ppsz_button_states[2]) ) == 0 )
p_state->i_state = OSD_BUTTON_PRESSED;
}
return p_state;
}
/*****************************************************************************
* Free state images
*****************************************************************************/
void osd_StatesFree( osd_menu_t *p_menu, osd_state_t *p_states )
{
osd_state_t *p_state = p_states;
osd_state_t *p_next = NULL;
osd_state_t *p_prev = NULL;
if( !p_state ) return;
while( p_state->p_next )
{
p_next = p_state->p_next;
p_state = p_next;
}
/* Then free end first and walk to the start. */
while( p_state->p_prev )
{
msg_Dbg( p_menu, " |- freeing state %s [%p]",
p_state->psz_state, p_state );
p_prev = p_state->p_prev;
p_state = p_prev;
if( p_state->p_next )
{
if( p_state->p_next->p_pic )
picture_Release( p_state->p_next->p_pic );
free( p_state->p_next->psz_state );
free( p_state->p_next );
p_state->p_next = NULL;
}
}
/* Free the last one. */
if( p_states )
{
msg_Dbg( p_menu, " |- freeing state %s [%p]",
p_state->psz_state, p_states );
if( p_states->p_pic )
picture_Release( p_state->p_next->p_pic );
free( p_state->psz_state );
free( p_states );
}
}
/*****************************************************************************
* osd_menu.h : 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_
extern const char * const ppsz_button_states[3];
/* 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( osd_menu_t *, const char *, const char * );
void osd_MenuFree ( osd_menu_t * );
void osd_ButtonFree( osd_menu_t *, osd_button_t * );
void osd_StatesFree( osd_menu_t *, osd_state_t * );
#endif
/*****************************************************************************
* 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
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_osd.h>
#include "osd_menu.h"
/***************************************************************************
* Prototypes
***************************************************************************/
int osd_parser_simpleOpen ( vlc_object_t *p_this );
int osd_parser_xmlOpen ( vlc_object_t *p_this );
static void osd_parser_Close( vlc_object_t *p_this );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_module_begin ()
add_submodule ()
set_description( N_("OSD configuration importer") )
add_shortcut( "import-osd" )
set_capability( "osd parser", 0)
set_callbacks( osd_parser_simpleOpen, osd_parser_Close )
add_submodule ()
set_description( N_("XML OSD configuration importer") )
add_shortcut( "import-osd-xml" )
set_capability( "osd parser", 0)
set_callbacks( osd_parser_xmlOpen, osd_parser_Close )
vlc_module_end ()
/*****************************************************************************
* osd_parser_Close: Free all osd menu structure resources
*****************************************************************************/
void osd_parser_Close ( vlc_object_t *p_this )
{
osd_menu_t *p_menu = (osd_menu_t *) p_this;
if( p_menu )
osd_MenuFree( p_menu );
}
This diff is collapsed.
/*****************************************************************************
* xml.c - The OSD Menu XML parser code.
*****************************************************************************
* Copyright (C) 2005-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
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc_common.h>
#include "osd_menu.h"
int osd_parser_xmlOpen ( vlc_object_t *p_this );
/****************************************************************************
* Local structures
****************************************************************************/
int osd_parser_xmlOpen( vlc_object_t *p_this )
{
VLC_UNUSED(p_this);
return VLC_SUCCESS;
}
...@@ -46,13 +46,6 @@ if !HAVE_WIN32 ...@@ -46,13 +46,6 @@ if !HAVE_WIN32
libvlc_LTLIBRARIES += libdynamicoverlay_plugin.la libvlc_LTLIBRARIES += libdynamicoverlay_plugin.la
endif endif
libosdmenu_plugin_la_SOURCES = osdmenu.c
libosdmenu_plugin_la_CFLAGS = $(AM_CFLAGS) -DPKGDATADIR=\"$(vlcdatadir)\"
libosdmenu_plugin_la_LIBADD = $(AM_LIBADD)
if BUILD_OSDMENU
libvlc_LTLIBRARIES += libosdmenu_plugin.la
endif
libremoteosd_plugin_la_SOURCES = remoteosd.c remoteosd_rfbproto.h libremoteosd_plugin_la_SOURCES = remoteosd.c remoteosd_rfbproto.h
libremoteosd_plugin_la_CFLAGS = $(AM_CFLAGS) $(GCRYPT_CFLAGS) libremoteosd_plugin_la_CFLAGS = $(AM_CFLAGS) $(GCRYPT_CFLAGS)
libremoteosd_plugin_la_LIBADD = $(AM_LIBADD) $(GCRYPT_LIBS) $(LIBS_remoteosd) libremoteosd_plugin_la_LIBADD = $(AM_LIBADD) $(GCRYPT_LIBS) $(LIBS_remoteosd)
......
This diff is collapsed.
...@@ -947,11 +947,6 @@ modules/misc/inhibit/dbus.c ...@@ -947,11 +947,6 @@ modules/misc/inhibit/dbus.c
modules/misc/inhibit/mce.c modules/misc/inhibit/mce.c
modules/misc/inhibit/xdg.c modules/misc/inhibit/xdg.c
modules/misc/logger.c modules/misc/logger.c
modules/misc/osd/osd_menu.c
modules/misc/osd/osd_menu.h
modules/misc/osd/parser.c
modules/misc/osd/simple.c
modules/misc/osd/xml.c
modules/misc/playlist/export.c modules/misc/playlist/export.c
modules/misc/playlist/html.c modules/misc/playlist/html.c
modules/misc/playlist/m3u.c modules/misc/playlist/m3u.c
...@@ -1116,7 +1111,6 @@ modules/video_filter/motionblur.c ...@@ -1116,7 +1111,6 @@ modules/video_filter/motionblur.c
modules/video_filter/motiondetect.c modules/video_filter/motiondetect.c
modules/video_filter/opencv_example.cpp modules/video_filter/opencv_example.cpp
modules/video_filter/opencv_wrapper.c modules/video_filter/opencv_wrapper.c
modules/video_filter/osdmenu.c
modules/video_filter/panoramix.c modules/video_filter/panoramix.c
modules/video_filter/posterize.c modules/video_filter/posterize.c
modules/video_filter/postproc.c modules/video_filter/postproc.c
......
vlc.desktop vlc.desktop
osdmenu/default.cfg
...@@ -42,29 +42,17 @@ EXTRA_DIST += \ ...@@ -42,29 +42,17 @@ EXTRA_DIST += \
$(DIST_skins2) \ $(DIST_skins2) \
$(DIST_icons) \ $(DIST_icons) \
$(DIST_http_lua) \ $(DIST_http_lua) \
osdmenu/default.cfg.in \
$(DIST_osdmenu_default) \
$(DIST_solid) $(DIST_solid)
CLEANFILES += osdmenu/default.cfg
nobase_vlcdata_DATA = nobase_vlcdata_DATA =
if BUILD_SKINS if BUILD_SKINS
nobase_vlcdata_DATA += skins2/default.vlt nobase_vlcdata_DATA += skins2/default.vlt
nobase_vlcdata_DATA += $(DIST_skins2) nobase_vlcdata_DATA += $(DIST_skins2)
endif endif
if BUILD_OSDMENU
nobase_vlcdata_DATA += \
osdmenu/default.cfg \
$(DIST_osdmenu_default)
endif
if KDE_SOLID if KDE_SOLID
soliddata_DATA = $(DIST_solid) soliddata_DATA = $(DIST_solid)
endif endif
osdmenu/default.cfg: osdmenu/default.cfg.in $(top_builddir)/config.status
$(AM_V_GEN)mkdir -p osdmenu; \
sed -e 's,\@vlcdatadir\@,$(vlcdatadir),g' < "$<" > $@
DIST_icons = \ DIST_icons = \
vlc512x512.png vlc512x512.png
...@@ -93,35 +81,6 @@ skins2/default.vlt: $(skins2_default_vlt_FILES) ...@@ -93,35 +81,6 @@ skins2/default.vlt: $(skins2_default_vlt_FILES)
LC_ALL=C sort -z | \ LC_ALL=C sort -z | \
tar cvv --exclude .svn --no-recursion --null -T -) | \ tar cvv --exclude .svn --no-recursion --null -T -) | \
gzip -n > skins2/default.vlt gzip -n > skins2/default.vlt
DIST_osdmenu_default = \
osdmenu/default/unselected.png \
osdmenu/default/selection/bw.png \
osdmenu/default/selection/esc.png \
osdmenu/default/selection/fw.png \
osdmenu/default/selection/volume.png \
osdmenu/default/selection/next.png \
osdmenu/default/selection/play_pause.png \
osdmenu/default/selection/previous.png \
osdmenu/default/selection/stop.png \
osdmenu/default/selected/bw.png \
osdmenu/default/selected/next.png \
osdmenu/default/selected/play_pause.png \
osdmenu/default/selected/fw.png \
osdmenu/default/selected/stop.png \
osdmenu/default/selected/previous.png \
osdmenu/default/selected/esc.png \
osdmenu/default/selected/volume.png \
osdmenu/default/volume/volume_00.png \
osdmenu/default/volume/volume_01.png \
osdmenu/default/volume/volume_02.png \
osdmenu/default/volume/volume_03.png \
osdmenu/default/volume/volume_04.png \
osdmenu/default/volume/volume_05.png \
osdmenu/default/volume/volume_06.png \
osdmenu/default/volume/volume_07.png \
osdmenu/default/volume/volume_08.png \
osdmenu/default/volume/volume_09.png \
osdmenu/default/volume/volume_10.png
# #
# LUA # LUA
......
dir @vlcdatadir@/osdmenu/default
action key-play-pause (0,0)
unselect unselected.png
select selection/play_pause.png
pressed selected/play_pause.png
end
action key-stop (0,0)
unselect unselected.png
select selection/stop.png
pressed selected/stop.png
end
action key-chapter-prev (0,0)
unselect unselected.png
select selection/previous.png
pressed selected/previous.png
end
action key-jump-medium (0,0)
unselect unselected.png
select selection/bw.png
pressed selected/bw.png
end
action key-jump+medium (0,0)
unselect unselected.png
select selection/fw.png
pressed selected/fw.png
end
action key-chapter-next (0,0)
unselect unselected.png
select selection/next.png
pressed selected/next.png
end
action key-quit (0,0)
unselect unselected.png
select selection/esc.png
pressed selected/esc.png
end
action key-vol-up (0,0)
unselect unselected.png
select selection/volume.png
pressed selected/volume.png
action key-vol-up (480,0)
type volume
range key-vol-down 3
volume/volume_00.png
volume/volume_01.png
volume/volume_02.png
volume/volume_03.png
volume/volume_04.png
volume/volume_05.png
volume/volume_06.png
volume/volume_07.png
volume/volume_08.png
volume/volume_09.png
volume/volume_10.png
end
end
end
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