objects.push_back( 0 ); varnames.push_back( "" ); \
i_last_separator = objects.size(); }
-static int InputAutoMenuBuilder( vlc_object_t *p_object,
+static int InputAutoMenuBuilder( input_thread_t *p_object,
vector<vlc_object_t *> &objects,
vector<const char *> &varnames )
{
**/
QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *menu )
{
- vlc_object_t *p_object;
- vector<vlc_object_t *> objects;
- vector<const char *> varnames;
-
if( !menu ) menu = new QMenu();
if( menu->isEmpty() )
ACT_ADD( menu, "navigation", qtr( "&Navigation" ) );
}
- p_object = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_INPUT,
- FIND_ANYWHERE );
- InputAutoMenuBuilder( p_object, objects, varnames );
+ input_thread_t *p_object;
+ vector<vlc_object_t *> objects;
+ vector<const char *> varnames;
+
+ p_object = THEMIM->getInput();
+ InputAutoMenuBuilder( p_object, objects, varnames );
PUSH_VAR( "prev-title" );
PUSH_VAR( "next-title" );
PUSH_VAR( "prev-chapter" );
{
vlc_object_hold( p_input );
varnames.push_back( "audio-es" );
- InputAutoMenuBuilder( VLC_OBJECT( p_input ), objects, varnames );
+ InputAutoMenuBuilder( p_input, objects, varnames );
PUSH_SEPARATOR;
}
menu->addSeparator();
vlc_object_hold( p_input );
- InputAutoMenuBuilder( VLC_OBJECT( p_input ), objects, varnames );
+ InputAutoMenuBuilder( p_input, objects, varnames );
vlc_object_release( p_input );
submenu = new QMenu( menu );
bool forceDisabled = false;
if( !strcmp( psz_var, "spu-es" ) )
{
- vlc_object_t *p_vout = THEMIM->getVout();
+ vout_thread_t *p_vout = THEMIM->getVout();
forceDisabled = ( p_vout == NULL );
if( p_vout )
vlc_object_release( p_vout );