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

Avoid using i_object_type

parent 396ce0f0
...@@ -127,9 +127,9 @@ vlc_module_begin () ...@@ -127,9 +127,9 @@ vlc_module_begin ()
vlc_module_end () vlc_module_end ()
/***************************************************************************** /*****************************************************************************
* OpenDecoder: probe the decoder and return score * Open: probe the decoder and return score
*****************************************************************************/ *****************************************************************************/
static int OpenDecoder( vlc_object_t *p_this ) static int Open( vlc_object_t *p_this )
{ {
decoder_t *p_dec = (decoder_t*)p_this; decoder_t *p_dec = (decoder_t*)p_this;
decoder_sys_t *p_sys; decoder_sys_t *p_sys;
...@@ -139,13 +139,6 @@ static int OpenDecoder( vlc_object_t *p_this ) ...@@ -139,13 +139,6 @@ static int OpenDecoder( vlc_object_t *p_this )
return VLC_EGENERIC; return VLC_EGENERIC;
} }
/* HACK: Don't use this codec if we don't have an mpga audio filter */
if( p_dec->i_object_type == VLC_OBJECT_DECODER &&
!module_exists( "mpgatofixed32" ) )
{
return VLC_EGENERIC;
}
/* Allocate the memory needed to store the decoder's structure */ /* Allocate the memory needed to store the decoder's structure */
if( ( p_dec->p_sys = p_sys = if( ( p_dec->p_sys = p_sys =
(decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL ) (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL )
...@@ -175,11 +168,20 @@ static int OpenDecoder( vlc_object_t *p_this ) ...@@ -175,11 +168,20 @@ static int OpenDecoder( vlc_object_t *p_this )
return VLC_SUCCESS; return VLC_SUCCESS;
} }
static int OpenDecoder( vlc_object_t *p_this )
{
/* HACK: Don't use this codec if we don't have an mpga audio filter */
if( !module_exists( "mpgatofixed32" ) )
return VLC_EGENERIC;
return Open( p_this );
}
static int OpenPacketizer( vlc_object_t *p_this ) static int OpenPacketizer( vlc_object_t *p_this )
{ {
decoder_t *p_dec = (decoder_t*)p_this; decoder_t *p_dec = (decoder_t*)p_this;
int i_ret = OpenDecoder( p_this ); int i_ret = Open( p_this );
if( i_ret == VLC_SUCCESS ) p_dec->p_sys->b_packetizer = true; if( i_ret == VLC_SUCCESS ) p_dec->p_sys->b_packetizer = true;
......
...@@ -287,7 +287,6 @@ static int OpenWindow (vlc_object_t *obj) ...@@ -287,7 +287,6 @@ static int OpenWindow (vlc_object_t *obj)
msg_Err( obj, "Maemo interface not found" ); msg_Err( obj, "Maemo interface not found" );
return VLC_EGENERIC; /* Maemo not in use */ return VLC_EGENERIC; /* Maemo not in use */
} }
assert (intf->i_object_type == VLC_OBJECT_INTF);
wnd->handle = request_video( intf, wnd->vout ); wnd->handle = request_video( intf, wnd->vout );
msg_Dbg( intf, "Using handle %p", wnd->handle ); msg_Dbg( intf, "Using handle %p", wnd->handle );
......
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