* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <vlc/vlc.h>
-#include <vlc/intf.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_interface.h>
#include "wxwidgets.hpp"
#include "interface.hpp"
FIND_PARENT );
if( p_object != NULL )
{
- if( is_popup )
- {
-#ifndef WIN32
- PUSH_VAR( "intf-switch" );
-#endif
- }
- else
- {
- PUSH_VAR( "intf-switch" );
- }
PUSH_VAR( "intf-add" );
PUSH_VAR( "intf-skins" );
vlc_object_release( p_object );
unsigned int i_last_separator = 0; \
ArrayOfInts ai_objects; \
ArrayOfStrings as_varnames; \
- playlist_t *p_playlist = (playlist_t *) vlc_object_find( p_intf, \
- VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );\
+ playlist_t *p_playlist = pl_Yield( p_intf ); \
if( !p_playlist ) \
return; \
input_thread_t *p_input = p_playlist->p_input
} \
else \
{ \
- if( p_playlist && !playlist_IsEmpty( p_playlist->i_size ) ) \
+ if( p_playlist && !playlist_IsEmpty( p_playlist ) ) \
{ \
popupmenu.InsertSeparator( 0 ); \
popupmenu.Insert( 0, Play_Event, wxU(_("Play")) ); \
} \
- if( p_playlist ) vlc_object_release( p_playlist ); \
+ if( p_playlist ) pl_Release( p_intf ); \
} \
\
popupmenu.Append( MenuDummy_Event, wxU(_("Miscellaneous")), \
}
vlc_object_release( p_input );
}
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
CREATE_POPUP;
}
}
vlc_object_release( p_input );
}
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
CREATE_POPUP;
}
p_intf->p_sys->p_popup_menu = &popupmenu;
p_parent->PopupMenu( &popupmenu, pos.x, pos.y );
p_intf->p_sys->p_popup_menu = NULL;
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
}
void PopupMenu( intf_thread_t *p_intf, wxWindow *p_parent,
p_intf->p_sys->p_popup_menu = &popupmenu;
p_parent->PopupMenu( &popupmenu, pos.x, pos.y );
p_intf->p_sys->p_popup_menu = NULL;
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
}
/*****************************************************************************
FIND_PARENT );
if( p_object != NULL )
{
- PUSH_VAR( "intf-switch" );
PUSH_VAR( "intf-add" );
vlc_object_release( p_object );
}
ArrayOfInts & rai_objects )
{
vlc_object_t *p_object;
- vlc_bool_t b_section_empty = VLC_FALSE;
+ bool b_section_empty = false;
int i;
i_item_id = i_start_id;
Enable( MenuDummy_Event + i, FALSE );
}
AppendSeparator();
- b_section_empty = VLC_TRUE;
+ b_section_empty = true;
continue;
}
if( rai_objects[i] == 0 )
{
Append( MenuDummy_Event, wxU(ras_varnames[i]) );
- b_section_empty = VLC_FALSE;
+ b_section_empty = false;
continue;
}
- p_object = (vlc_object_t *)vlc_object_get( p_intf,
- rai_objects[i] );
+ p_object = (vlc_object_t *)vlc_object_get( rai_objects[i] );
if( p_object == NULL ) continue;
- b_section_empty = VLC_FALSE;
+ b_section_empty = false;
CreateMenuItem( this, ras_varnames[i], p_object );
vlc_object_release( p_object );
}
if( (i_type & VLC_VAR_TYPE) != VLC_VAR_VARIABLE )
{
- /* Very evil hack ! intf-switch can have only one value */
- if( !strcmp( psz_var, "intf-switch" ) ) return FALSE;
if( val.i_int == 1 && b_root ) return TRUE;
else return FALSE;
}
CreateChoicesMenu( psz_var, p_object, TRUE ),
wxT("")/* Nothing for now (maybe use a GETLONGTEXT) */ );
- if( text.psz_string ) free( text.psz_string );
+ free( text.psz_string );
return;
}
break;
}
- if( text.psz_string ) free( text.psz_string );
+ free( text.psz_string );
}
wxMenu *Menu::CreateChoicesMenu( const char *psz_var, vlc_object_t *p_object,
val_list.p_list->p_values[i].psz_string ) )
menu->Check( i_item_id, TRUE );
- if( val.psz_string ) free( val.psz_string );
+ free( val.psz_string );
break;
case VLC_VAR_INTEGER:
if( event.GetId() >= Play_Event && event.GetId() <= Stop_Event )
{
input_thread_t *p_input;
- playlist_t * p_playlist =
- (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ playlist_t * p_playlist = pl_Yield( p_intf );
if( !p_playlist ) return;
switch( event.GetId() )
playlist_Next( p_playlist );
break;
}
-
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
return;
}
wxMenuItemExt *p_menuitemext = (wxMenuItemExt *)p_menuitem;
vlc_object_t *p_object;
- p_object = (vlc_object_t *)vlc_object_get( p_intf,
- p_menuitemext->i_object_id );
+ p_object = (vlc_object_t *)vlc_object_get( p_menuitemext->i_object_id );
if( p_object == NULL ) return;
wxMutexGuiLeave(); // We don't want deadlocks
wxMenuItemExt::~wxMenuItemExt()
{
- if( psz_var ) free( psz_var );
- if( ((i_val_type & VLC_VAR_TYPE) == VLC_VAR_STRING)
- && val.psz_string ) free( val.psz_string );
+ free( psz_var );
+ if( ( i_val_type & VLC_VAR_TYPE ) == VLC_VAR_STRING )
+ free( val.psz_string );
};