vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Tue Mar 29 16:46:47 2011 +0300| [c67b5ea615709b21b423fd25469c0366f3f35a05] | committer: Rémi Denis-Courmont
zvbi: convert dangerous OSDMessage() to safer msg_Info() Ideally, I guess a text SPU should be emitted instead. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c67b5ea615709b21b423fd25469c0366f3f35a05 --- modules/codec/zvbi.c | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/modules/codec/zvbi.c b/modules/codec/zvbi.c index 4e5834b..29636ec 100644 --- a/modules/codec/zvbi.c +++ b/modules/codec/zvbi.c @@ -47,7 +47,6 @@ #include <libzvbi.h> #include <vlc_codec.h> -#include <vlc_vout_osd.h> /***************************************************************************** * Module descriptor. @@ -661,14 +660,6 @@ static int Position( vlc_object_t *p_this, char const *psz_cmd, return VLC_SUCCESS; } -#include <vlc_vout.h> -#define OSDMessage(dec, fmt, ...) do { \ - vout_thread_t *p_vout = vlc_object_find( dec, VLC_OBJECT_VOUT, FIND_ANYWHERE ); \ - if( p_vout ) { \ - vout_OSDMessage( p_vout, fmt, __VA_ARGS__ ); \ - vlc_object_release( p_vout ); \ - } } while(0) - static int EventKey( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { @@ -691,7 +682,8 @@ static int EventKey( vlc_object_t *p_this, char const *psz_cmd, if ( !vbi_bcd_digits_greater( p_sys->i_wanted_subpage, 0x00 ) || vbi_bcd_digits_greater( p_sys->i_wanted_subpage, 0x99 ) ) p_sys->i_wanted_subpage = VBI_ANY_SUBNO; else - OSDMessage( p_this, SPU_DEFAULT_CHANNEL, "%s: %d", _("Subpage"), vbi_bcd2dec( p_sys->i_wanted_subpage) ); + msg_Info( p_dec, "subpage: %d", + vbi_bcd2dec( p_sys->i_wanted_subpage) ); p_sys->b_update = true; vlc_mutex_unlock( &p_sys->lock ); @@ -705,7 +697,8 @@ static int EventKey( vlc_object_t *p_this, char const *psz_cmd, p_sys->i_key[0] = p_sys->i_key[1]; p_sys->i_key[1] = p_sys->i_key[2]; p_sys->i_key[2] = (int)(newval.i_int - '0'); - OSDMessage( p_this, SPU_DEFAULT_CHANNEL, "%s: %c%c%c", _("Page"), (char)(p_sys->i_key[0]+'0'), (char)(p_sys->i_key[1]+'0'), (char)(p_sys->i_key[2]+'0') ); + msg_Info( p_dec, "page: %c%c%c", (char)(p_sys->i_key[0]+'0'), + (char)(p_sys->i_key[1]+'0'), (char)(p_sys->i_key[2]+'0') ); int i_new_page = 0; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
