modules/video_filter/osd_text.c: A video filter that uses freetpye2 to

render text on the video
include/osd.h: some constants useful when interfacing with the osd module
configure.ac.in: check for freetype2, enabled the osdtext module by default
Makefile.am: added osd.h, please check that this is correct
lirc.c: modified to provide feedback when buttons are pressed.

Look at the Feedback() function in lirc.c to see how this module can be used
parent d359ba6f
...@@ -193,6 +193,7 @@ HEADERS_include = \ ...@@ -193,6 +193,7 @@ HEADERS_include = \
include/vlc_threads.h \ include/vlc_threads.h \
include/vlc_threads_funcs.h \ include/vlc_threads_funcs.h \
include/win32_specific.h \ include/win32_specific.h \
include/osd.h \
$(NULL) $(NULL)
HEADERS_include_built = \ HEADERS_include_built = \
......
...@@ -1984,6 +1984,36 @@ from http://www.libsdl.org/, or configure with --disable-sdl. Have a nice day. ...@@ -1984,6 +1984,36 @@ from http://www.libsdl.org/, or configure with --disable-sdl. Have a nice day.
fi fi
fi fi
dnl
dnl freetype module
dnl
AC_ARG_ENABLE(freetype,
[ --enable-freetype freetype support (default enabled)])
if test "x${enable_freetype}" != "xno"
then
FREETYPE_PATH="${PATH}"
AC_ARG_WITH(freetype-config-path,
[ --with-freetype-config-path=PATH freetype-config path (default search in \$PATH)],
[ if test "x${with_freetype_config_path}" != "xno"
then
FREETYPE_PATH="${with_freetype_config_path}:${PATH}"
fi ])
AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no, ${SDL_PATH})
if test "x${SDL_CONFIG}" != "xno"
then
PLUGINS="${PLUGINS} osdtext"
CFLAGS_osdtext="${CFLAGS_osdtext} `${FREETYPE_CONFIG} --cflags`"
LDFLAGS_osdtext="${LDFLAGS_osdtext} `${FREETYPE_CONFIG} --libs`"
CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_freetype}"
elif test "x${enable_sdl}" = "xyes"
then
AC_MSG_ERROR([I couldn't find the freetype package. You can download libfreetype2
from http://www.freetype.org/, or configure with --disable-freetype. Have a nice day.
])
fi
fi
dnl dnl
dnl Qt Embedded module dnl Qt Embedded module
dnl (disabled by default) dnl (disabled by default)
......
/*****************************************************************************
* osd.h : Constants for use with osd modules
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: osd.h,v 1.1 2003/03/23 16:38:40 sigmunau Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
* 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#define OSD_ALIGN_LEFT 0
#define OSD_ALIGN_RIGHT 0x1
#define OSD_ALIGN_TOP 0
#define OSD_ALIGN_BOTTOM 0x2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* lirc.c : lirc plugin for vlc * lirc.c : lirc plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: lirc.c,v 1.4 2003/02/16 10:25:57 sigmunau Exp $ * $Id: lirc.c,v 1.5 2003/03/23 16:38:40 sigmunau Exp $
* *
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no> * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
* *
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <vlc/intf.h> #include <vlc/intf.h>
#include <vlc/vout.h> #include <vlc/vout.h>
#include <vlc/aout.h> #include <vlc/aout.h>
#include <osd.h>
#include <lirc/lirc_client.h> #include <lirc/lirc_client.h>
...@@ -45,6 +46,7 @@ struct intf_sys_t ...@@ -45,6 +46,7 @@ struct intf_sys_t
vlc_mutex_t change_lock; vlc_mutex_t change_lock;
input_thread_t * p_input; input_thread_t * p_input;
vout_thread_t * p_vout;
}; };
/***************************************************************************** /*****************************************************************************
...@@ -53,6 +55,7 @@ struct intf_sys_t ...@@ -53,6 +55,7 @@ struct intf_sys_t
static int Open ( vlc_object_t * ); static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * ); static void Close ( vlc_object_t * );
static void Run ( intf_thread_t * ); static void Run ( intf_thread_t * );
static void Feedback( intf_thread_t *, char * );
/***************************************************************************** /*****************************************************************************
* Module descriptor * Module descriptor
...@@ -116,7 +119,10 @@ static void Close( vlc_object_t *p_this ) ...@@ -116,7 +119,10 @@ static void Close( vlc_object_t *p_this )
{ {
vlc_object_release( p_intf->p_sys->p_input ); vlc_object_release( p_intf->p_sys->p_input );
} }
if( p_intf->p_sys->p_vout )
{
vlc_object_release( p_intf->p_sys->p_vout );
}
/* Destroy structure */ /* Destroy structure */
lirc_freeconfig( p_intf->p_sys->config ); lirc_freeconfig( p_intf->p_sys->config );
lirc_deinit(); lirc_deinit();
...@@ -131,7 +137,8 @@ static void Run( intf_thread_t *p_intf ) ...@@ -131,7 +137,8 @@ static void Run( intf_thread_t *p_intf )
char *code, *c; char *code, *c;
playlist_t *p_playlist; playlist_t *p_playlist;
input_thread_t *p_input; input_thread_t *p_input;
vout_thread_t *p_vout = NULL;
while( !p_intf->b_die ) while( !p_intf->b_die )
{ {
/* Sleep a bit */ /* Sleep a bit */
...@@ -150,6 +157,20 @@ static void Run( intf_thread_t *p_intf ) ...@@ -150,6 +157,20 @@ static void Run( intf_thread_t *p_intf )
} }
p_input = p_intf->p_sys->p_input; p_input = p_intf->p_sys->p_input;
/* Update the vout */
if( p_vout == NULL )
{
p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
FIND_ANYWHERE );
p_intf->p_sys->p_vout = p_vout;
}
else if( p_vout->b_die )
{
vlc_object_release( p_vout );
p_vout = NULL;
p_intf->p_sys->p_vout = NULL;
}
/* We poll the lircsocket */ /* We poll the lircsocket */
if( lirc_nextcode(&code) != 0 ) if( lirc_nextcode(&code) != 0 )
{ {
...@@ -165,37 +186,37 @@ static void Run( intf_thread_t *p_intf ) ...@@ -165,37 +186,37 @@ static void Run( intf_thread_t *p_intf )
&& lirc_code2char( p_intf->p_sys->config, code, &c ) == 0 && lirc_code2char( p_intf->p_sys->config, code, &c ) == 0
&& c != NULL ) && c != NULL )
{ {
if( !strcmp( c, "QUIT" ) ) if( !strcmp( c, "QUIT" ) )
{ {
p_intf->p_vlc->b_die = VLC_TRUE; p_intf->p_vlc->b_die = VLC_TRUE;
Feedback( p_intf, _("Quit" ) );
continue; continue;
} }
if( !strcmp( c, "VOL_UP" ) ) if( !strcmp( c, "VOL_UP" ) )
{ {
aout_VolumeUp( p_intf, 1, NULL ); audio_volume_t i_newvol;
char string[9];
aout_VolumeUp( p_intf, 1, &i_newvol );
sprintf( string, "Vol %%%d", i_newvol*100/AOUT_VOLUME_MAX );
Feedback( p_intf, string );
} }
if( !strcmp( c, "VOL_DOWN" ) ) if( !strcmp( c, "VOL_DOWN" ) )
{ {
aout_VolumeDown( p_intf, 1, NULL ); audio_volume_t i_newvol;
char string[9];
aout_VolumeDown( p_intf, 1, &i_newvol );
sprintf( string, "Vol %%%d", i_newvol*100/AOUT_VOLUME_MAX );
Feedback( p_intf, string );
} }
if( !strcmp( c, "FULLSCREEN" ) ) if( p_vout )
{ {
vout_thread_t *p_vout; if( !strcmp( c, "FULLSCREEN" ) )
p_vout = vlc_object_find( p_intf->p_sys->p_input,
VLC_OBJECT_VOUT, FIND_CHILD );
if( p_vout )
{ {
p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
vlc_object_release( p_vout ); continue;
} }
continue; if( !strcmp( c, "ACTIVATE" ) )
}
if( !strcmp( c, "ACTIVATE" ) )
{
vout_thread_t *p_vout;
p_vout = vlc_object_find( p_intf->p_sys->p_input,
VLC_OBJECT_VOUT, FIND_CHILD );
if( p_vout )
{ {
vlc_value_t val; vlc_value_t val;
val.psz_string = "ENTER"; val.psz_string = "ENTER";
...@@ -203,17 +224,10 @@ static void Run( intf_thread_t *p_intf ) ...@@ -203,17 +224,10 @@ static void Run( intf_thread_t *p_intf )
{ {
msg_Warn( p_intf, "key-press failed" ); msg_Warn( p_intf, "key-press failed" );
} }
vlc_object_release( p_vout ); continue;
} }
continue;
}
if( !strcmp( c, "LEFT" ) ) if( !strcmp( c, "LEFT" ) )
{
vout_thread_t *p_vout;
p_vout = vlc_object_find( p_intf->p_sys->p_input,
VLC_OBJECT_VOUT, FIND_CHILD );
if( p_vout )
{ {
vlc_value_t val; vlc_value_t val;
val.psz_string = "LEFT"; val.psz_string = "LEFT";
...@@ -221,17 +235,10 @@ static void Run( intf_thread_t *p_intf ) ...@@ -221,17 +235,10 @@ static void Run( intf_thread_t *p_intf )
{ {
msg_Warn( p_intf, "key-press failed" ); msg_Warn( p_intf, "key-press failed" );
} }
vlc_object_release( p_vout ); continue;
} }
continue;
}
if( !strcmp( c, "RIGHT" ) ) if( !strcmp( c, "RIGHT" ) )
{
vout_thread_t *p_vout;
p_vout = vlc_object_find( p_intf->p_sys->p_input,
VLC_OBJECT_VOUT, FIND_CHILD );
if( p_vout )
{ {
vlc_value_t val; vlc_value_t val;
val.psz_string = "RIGHT"; val.psz_string = "RIGHT";
...@@ -239,17 +246,10 @@ static void Run( intf_thread_t *p_intf ) ...@@ -239,17 +246,10 @@ static void Run( intf_thread_t *p_intf )
{ {
msg_Warn( p_intf, "key-press failed" ); msg_Warn( p_intf, "key-press failed" );
} }
vlc_object_release( p_vout ); continue;
} }
continue;
}
if( !strcmp( c, "UP" ) ) if( !strcmp( c, "UP" ) )
{
vout_thread_t *p_vout;
p_vout = vlc_object_find( p_intf->p_sys->p_input,
VLC_OBJECT_VOUT, FIND_CHILD );
if( p_vout )
{ {
vlc_value_t val; vlc_value_t val;
val.psz_string = "UP"; val.psz_string = "UP";
...@@ -257,17 +257,10 @@ static void Run( intf_thread_t *p_intf ) ...@@ -257,17 +257,10 @@ static void Run( intf_thread_t *p_intf )
{ {
msg_Warn( p_intf, "key-press failed" ); msg_Warn( p_intf, "key-press failed" );
} }
vlc_object_release( p_vout ); continue;
} }
continue;
}
if( !strcmp( c, "DOWN" ) ) if( !strcmp( c, "DOWN" ) )
{
vout_thread_t *p_vout;
p_vout = vlc_object_find( p_intf->p_sys->p_input,
VLC_OBJECT_VOUT, FIND_CHILD );
if( p_vout )
{ {
vlc_value_t val; vlc_value_t val;
val.psz_string = "DOWN"; val.psz_string = "DOWN";
...@@ -275,11 +268,10 @@ static void Run( intf_thread_t *p_intf ) ...@@ -275,11 +268,10 @@ static void Run( intf_thread_t *p_intf )
{ {
msg_Warn( p_intf, "key-press failed" ); msg_Warn( p_intf, "key-press failed" );
} }
vlc_object_release( p_vout ); continue;
} }
continue;
} }
if( !strcmp( c, "PLAY" ) ) if( !strcmp( c, "PLAY" ) )
{ {
p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
...@@ -294,12 +286,15 @@ static void Run( intf_thread_t *p_intf ) ...@@ -294,12 +286,15 @@ static void Run( intf_thread_t *p_intf )
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
} }
} }
continue;
} }
if( !strcmp( c, "PLAYPAUSE" ) ) if( !strcmp( c, "PLAYPAUSE" ) )
{ {
if( p_input && if( p_input &&
p_input->stream.control.i_status != PAUSE_S ) p_input->stream.control.i_status != PAUSE_S )
{ {
Feedback( p_intf, _( "Pause" ) );
input_SetStatus( p_input, INPUT_STATUS_PAUSE ); input_SetStatus( p_input, INPUT_STATUS_PAUSE );
} }
else else
...@@ -312,16 +307,20 @@ static void Run( intf_thread_t *p_intf ) ...@@ -312,16 +307,20 @@ static void Run( intf_thread_t *p_intf )
if( p_playlist->i_size ) if( p_playlist->i_size )
{ {
vlc_mutex_unlock( &p_playlist->object_lock ); vlc_mutex_unlock( &p_playlist->object_lock );
Feedback( p_intf, _( "Play" ) );
playlist_Play( p_playlist ); playlist_Play( p_playlist );
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
} }
} }
} }
} continue;
}
else if( p_input ) else if( p_input )
{ {
if( !strcmp( c, "PAUSE" ) ) if( !strcmp( c, "PAUSE" ) )
{ {
Feedback( p_intf, _( "Pause" ) );
input_SetStatus( p_input, INPUT_STATUS_PAUSE ); input_SetStatus( p_input, INPUT_STATUS_PAUSE );
} }
else if( !strcmp( c, "NEXT" ) ) else if( !strcmp( c, "NEXT" ) )
...@@ -369,3 +368,27 @@ static void Run( intf_thread_t *p_intf ) ...@@ -369,3 +368,27 @@ static void Run( intf_thread_t *p_intf )
} }
} }
static void Feedback( intf_thread_t *p_intf, char *psz_string )
{
vlc_value_t val, lockval;
if ( p_intf->p_sys->p_vout
&& var_Get( p_intf->p_sys->p_vout, "lock", &lockval ) == VLC_SUCCESS )
{
vlc_mutex_lock( lockval.p_address );
val.i_int = OSD_ALIGN_RIGHT|OSD_ALIGN_BOTTOM;
var_Set( p_intf->p_sys->p_vout, "flags", val );
val.i_int = 400000;
var_Set( p_intf->p_sys->p_vout, "duration", val );
val.i_int = 30;
var_Set( p_intf->p_sys->p_vout, "x-margin", val );
val.i_int = 20;
var_Set( p_intf->p_sys->p_vout, "y-margin", val );
val.psz_string = psz_string;
var_Set( p_intf->p_sys->p_vout, "string", val );
vlc_mutex_unlock( lockval.p_address );
}
else
{
msg_Dbg( p_intf, psz_string );
}
}
This diff is collapsed.
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