* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include <vlc_intf_strings.h>
// Add static entries to menus
void addDPStaticEntry( QMenu *menu,
const QString text,
- char *help,
- char *icon,
+ const char *help,
+ const char *icon,
const char *member,
- char *shortcut )
+ const char *shortcut )
{
if( !EMPTY_STR( icon ) > 0 )
{
void addMIMStaticEntry( intf_thread_t *p_intf,
QMenu *menu,
const QString text,
- char *help,
- char *icon,
+ const char *help,
+ const char *icon,
const char *member )
{
if( strlen( icon ) > 0 )
* Definitions of variables for the dynamic menus
*****************************************************************************/
#define PUSH_VAR( var ) varnames.push_back( var ); \
- objects.push_back( p_object->i_object_id )
+ objects.push_back( p_object )
#define PUSH_SEPARATOR if( objects.size() != i_last_separator ) { \
- objects.push_back( 0 ); varnames.push_back( "" ); \
+ objects.push_back( NULL ); varnames.push_back( "" ); \
i_last_separator = objects.size(); }
static int InputAutoMenuBuilder( vlc_object_t *p_object,
- vector<int> &objects,
+ vector<vlc_object_t *> &objects,
vector<const char *> &varnames )
{
PUSH_VAR( "bookmark" );
}
static int VideoAutoMenuBuilder( vlc_object_t *p_object,
- vector<int> &objects,
+ vector<vlc_object_t *> &objects,
vector<const char *> &varnames )
{
PUSH_VAR( "fullscreen" );
}
static int AudioAutoMenuBuilder( vlc_object_t *p_object,
- vector<int> &objects,
+ vector<vlc_object_t *> &objects,
vector<const char *> &varnames )
{
PUSH_VAR( "audio-device" );
intf_thread_t *p_intf,
bool visual_selector_enabled )
{
+ /* QMainWindows->menuBar()
+ gives the QProcess::destroyed timeout issue on Cleanlooks style with
+ setDesktopAware set to false */
QMenuBar *bar = mi->menuBar();
BAR_ADD( FileMenu(), qtr( "&Media" ) );
BAR_ADD( PlaylistMenu( p_intf, mi ), qtr( "&Playlist" ) );
- BAR_ADD( ToolsMenu( p_intf, mi, visual_selector_enabled, true ), qtr( "&Tools" ) );
+ BAR_ADD( ToolsMenu( p_intf, NULL, mi, visual_selector_enabled, true ),
+ qtr( "&Tools" ) );
BAR_DADD( AudioMenu( p_intf, NULL ), qtr( "&Audio" ), 2 );
BAR_DADD( VideoMenu( p_intf, NULL ), qtr( "&Video" ), 1 );
BAR_DADD( NavigMenu( p_intf, NULL ), qtr( "&Playback" ), 3 );
- BAR_ADD( HelpMenu(), qtr( "&Help" ) );
+ BAR_ADD( HelpMenu( NULL ), qtr( "&Help" ) );
}
#undef BAR_ADD
#undef BAR_DADD
* This menu can be an interface menu but also a right click menu.
**/
QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf,
+ QMenu *current,
MainInterface *mi,
bool visual_selector_enabled,
bool with_intf )
{
- QMenu *menu = new QMenu;
+ QMenu *menu = new QMenu( current );
if( mi )
{
menu->addAction( QIcon( ":/pixmaps/playlist_16px.png" ),
if( with_intf )
{
- QMenu *intfmenu = InterfacesMenu( p_intf, NULL );
+ QMenu *intfmenu = InterfacesMenu( p_intf, menu );
intfmenu->setTitle( qtr( "Add Interfaces" ) );
menu->addMenu( intfmenu );
menu->addSeparator();
SLOT( bookmarksDialog() ), "Ctrl+B" );
#ifdef ENABLE_VLM
addDPStaticEntry( menu, qtr( I_MENU_VLM ), "", "", SLOT( vlmDialog() ),
- "Ctrl+V" );
+ "Ctrl+W" );
#endif
menu->addSeparator();
**/
QMenu *QVLCMenu::InterfacesMenu( intf_thread_t *p_intf, QMenu *current )
{
- vector<int> objects;
+ vector<vlc_object_t *> objects;
vector<const char *> varnames;
/** \todo add "switch to XXX" */
varnames.push_back( "intf-add" );
- objects.push_back( p_intf->i_object_id );
+ objects.push_back( VLC_OBJECT(p_intf) );
- QMenu *menu = Populate( p_intf, current, varnames, objects );
-
- if( !p_intf->pf_show_dialog )
- {
- menu->addSeparator();
- menu->addAction( qtr( "Switch to skins" ), THEDP, SLOT( switchToSkins() ),
- QString( "Ctrl+Z" ) );
- if( module_Exists( VLC_OBJECT( p_intf ), "wxwidgets" ) )
- {
- menu->addAction( qtr( "Switch to WxWidgets" ), THEDP,
- SLOT( switchToWx() ) );
- }
- }
+ QMenu *submenu = new QMenu( current );
+ QMenu *menu = Populate( p_intf, submenu, varnames, objects );
CONNECT( menu, aboutToShow(), THEDP->menusUpdateMapper, map() );
THEDP->menusUpdateMapper->setMapping( menu, 4 );
*/
QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current )
{
- vector<int> objects;
+ vector<vlc_object_t *> objects;
vector<const char *> varnames;
vlc_object_t *p_object = ( vlc_object_t * )vlc_object_find( p_intf,
QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current )
{
vlc_object_t *p_object;
- vector<int> objects;
+ vector<vlc_object_t *> objects;
vector<const char *> varnames;
p_object = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_INPUT,
* Navigation Menu
* For DVD, MP4, MOV and other chapter based format
**/
-QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *navMenu )
+QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *menu )
{
vlc_object_t *p_object;
- vector<int> objects;
+ vector<vlc_object_t *> objects;
vector<const char *> varnames;
p_object = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_INPUT,
PUSH_VAR( "prev-chapter" ); PUSH_VAR( "next-chapter" );
vlc_object_release( p_object );
}
- navMenu = new QMenu();
+ QMenu *navMenu = new QMenu( menu );
addDPStaticEntry( navMenu, qtr( I_MENU_GOTOTIME ), "","",
SLOT( gotoTimeDialog() ), "Ctrl+T" );
navMenu->addSeparator();
char **ppsz_longnames;
char **ppsz_names = services_discovery_GetServicesNames( p_intf,
&ppsz_longnames );
+ if( !ppsz_names )
+ return menu;
+
char **ppsz_name = ppsz_names, **ppsz_longname = ppsz_longnames;
for( ; *ppsz_name; ppsz_name++, ppsz_longname++ )
{
/**
* Help/About Menu
**/
-QMenu *QVLCMenu::HelpMenu()
+QMenu *QVLCMenu::HelpMenu( QMenu *current )
{
- QMenu *menu = new QMenu();
+ QMenu *menu = new QMenu( current );
addDPStaticEntry( menu, qtr( "Help..." ) , "",
":/pixmaps/menus_help_16px.png", SLOT( helpDialog() ), "F1" );
#ifdef UPDATE_CHECK
- addDPStaticEntry( menu, qtr( "Update" ) , "", "", SLOT( updateDialog() ), "");
+ addDPStaticEntry( menu, qtr( "Check for updates..." ) , "", "", SLOT( updateDialog() ), "");
#endif
menu->addSeparator();
addDPStaticEntry( menu, qtr( I_MENU_ABOUT ), "", "", SLOT( aboutDialog() ),
*****************************************************************************/
#define POPUP_BOILERPLATE \
unsigned int i_last_separator = 0; \
- vector<int> objects; \
+ vector<vlc_object_t *> objects; \
vector<const char *> varnames; \
input_thread_t *p_input = THEMIM->getInput();
addMIMStaticEntry( p_intf, menu, qtr( "Play" ), "",
":/pixmaps/play_16px.png", SLOT( togglePlayPause() ) );
}
- else if( THEPL->items.i_size && THEPL->i_enabled )
+ else if( THEPL->items.i_size )
addMIMStaticEntry( p_intf, menu, qtr( "Play" ), "",
":/pixmaps/play_16px.png", SLOT( togglePlayPause() ) );
void QVLCMenu::PopupMenuStaticEntries( intf_thread_t *p_intf, QMenu *menu )
{
- QMenu *toolsmenu = ToolsMenu( p_intf, NULL, false, true );
+ QMenu *toolsmenu = ToolsMenu( p_intf, menu, false, true );
toolsmenu->setTitle( qtr( "Tools" ) );
menu->addMenu( toolsmenu );
- QMenu *openmenu = new QMenu( qtr( "Open" ) );
+ QMenu *openmenu = new QMenu( qtr( "Open" ), menu );
openmenu->addAction( qtr( "Open &File..." ), THEDP,
SLOT( openFileDialog() ) );
openmenu->addAction( qtr( "Open &Disc..." ), THEDP,
menu->addMenu( openmenu );
menu->addSeparator();
- QMenu *helpmenu = HelpMenu();
+ QMenu *helpmenu = HelpMenu( menu );
helpmenu->setTitle( qtr( "Help" ) );
menu->addMenu( helpmenu );
{
vlc_object_yield( p_input );
varnames.push_back( "video-es" );
- objects.push_back( p_input->i_object_id );
+ objects.push_back( VLC_OBJECT(p_input) );
varnames.push_back( "spu-es" );
- objects.push_back( p_input->i_object_id );
+ objects.push_back( VLC_OBJECT(p_input) );
vlc_object_t *p_vout = ( vlc_object_t * )vlc_object_find( p_input,
VLC_OBJECT_VOUT, FIND_CHILD );
if( p_vout )
{
vlc_object_yield( p_input );
varnames.push_back( "audio-es" );
- objects.push_back( p_input->i_object_id );
+ objects.push_back( VLC_OBJECT(p_input) );
vlc_object_t *p_aout = ( vlc_object_t * )vlc_object_find( p_input,
VLC_OBJECT_AOUT, FIND_ANYWHERE );
if( p_aout )
/* Audio menu */
PUSH_SEPARATOR;
varnames.push_back( "audio-es" );
- objects.push_back( p_input->i_object_id );
+ objects.push_back( VLC_OBJECT(p_input) );
vlc_object_t *p_aout = ( vlc_object_t * )
vlc_object_find( p_input, VLC_OBJECT_AOUT, FIND_ANYWHERE );
if( p_aout )
/* Video menu */
PUSH_SEPARATOR;
varnames.push_back( "video-es" );
- objects.push_back( p_input->i_object_id );
+ objects.push_back( VLC_OBJECT(p_input) );
varnames.push_back( "spu-es" );
- objects.push_back( p_input->i_object_id );
+ objects.push_back( VLC_OBJECT(p_input) );
vlc_object_t *p_vout = ( vlc_object_t * )
vlc_object_find( p_input, VLC_OBJECT_VOUT, FIND_CHILD );
if( p_vout )
VideoAutoMenuBuilder( p_vout, objects, varnames );
vlc_object_release( p_vout );
}
+
+ vlc_object_release( p_input );
}
QMenu *menu = new QMenu();
QMenu * QVLCMenu::Populate( intf_thread_t *p_intf,
QMenu *current,
vector< const char *> & varnames,
- vector<int> & objects,
+ vector<vlc_object_t *> & objects,
bool append )
{
QMenu *menu = current;
currentGroup = NULL;
vlc_object_t *p_object;
- vlc_bool_t b_section_empty = VLC_FALSE;
+ bool b_section_empty = false;
int i;
#define APPEND_EMPTY { QAction *action = menu->addAction( qtr( "Empty" ) ); \
if( b_section_empty )
APPEND_EMPTY;
menu->addSeparator();
- b_section_empty = VLC_TRUE;
+ b_section_empty = true;
continue;
}
- if( objects[i] == 0 )
- {
- /// \bug What is this ?
- // Append( menu, varnames[i], NULL );
- b_section_empty = VLC_FALSE;
- continue;
- }
-
- p_object = ( vlc_object_t * )vlc_object_get( p_intf, objects[i] );
+ p_object = objects[i];
if( p_object == NULL ) continue;
- b_section_empty = VLC_FALSE;
+ b_section_empty = false;
/* Ugly specific stuff */
if( strstr( varnames[i], "intf-add" ) )
CreateItem( menu, varnames[i], p_object, false );
else
CreateItem( menu, varnames[i], p_object, true );
- vlc_object_release( p_object );
}
/* Special case for empty menus */
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;
}
/* Append choices menu */
if( b_submenu )
{
- QMenu *submenu = new QMenu();
+ QMenu *submenu = new QMenu( menu );
submenu->setTitle( qfu( text.psz_string ?
text.psz_string : psz_var ) );
if( CreateChoicesMenu( submenu, psz_var, p_object, true ) == 0 )
case VLC_VAR_VOID:
var_Get( p_object, psz_var, &val );
CreateAndConnect( menu, psz_var, TEXT_OR_VAR, "", ITEM_NORMAL,
- p_object->i_object_id, val, i_type );
+ p_object, val, i_type );
break;
case VLC_VAR_BOOL:
var_Get( p_object, psz_var, &val );
val.b_bool = !val.b_bool;
CreateAndConnect( menu, psz_var, TEXT_OR_VAR, "", ITEM_CHECK,
- p_object->i_object_id, val, i_type, !val.b_bool );
+ p_object, val, i_type, !val.b_bool );
break;
}
FREENULL( text.psz_string );
{
vlc_value_t another_val;
QString menutext;
- QMenu *subsubmenu = new QMenu();
+ QMenu *subsubmenu = new QMenu( submenu );
switch( i_type & VLC_VAR_TYPE )
{
another_val.psz_string = strdup( CURVAL.psz_string );
menutext = qfu( CURTEXT ? CURTEXT : another_val.psz_string );
CreateAndConnect( submenu, psz_var, menutext, "", NORMAL_OR_RADIO,
- p_object->i_object_id, another_val, i_type,
+ p_object, another_val, i_type,
NOTCOMMAND && val.psz_string &&
!strcmp( val.psz_string, CURVAL.psz_string ) );
- if( val.psz_string ) free( val.psz_string );
+ free( val.psz_string );
break;
case VLC_VAR_INTEGER:
if( CURTEXT ) menutext = qfu( CURTEXT );
else menutext.sprintf( "%d", CURVAL.i_int );
CreateAndConnect( submenu, psz_var, menutext, "", NORMAL_OR_RADIO,
- p_object->i_object_id, CURVAL, i_type,
+ p_object, CURVAL, i_type,
NOTCOMMAND && CURVAL.i_int == val.i_int );
break;
if( CURTEXT ) menutext = qfu( CURTEXT );
else menutext.sprintf( "%.2f", CURVAL.f_float );
CreateAndConnect( submenu, psz_var, menutext, "", NORMAL_OR_RADIO,
- p_object->i_object_id, CURVAL, i_type,
+ p_object, CURVAL, i_type,
NOTCOMMAND && CURVAL.f_float == val.f_float );
break;
void QVLCMenu::CreateAndConnect( QMenu *menu, const char *psz_var,
QString text, QString help,
- int i_item_type, int i_object_id,
+ int i_item_type, vlc_object_t *object,
vlc_value_t val, int i_val_type,
bool checked )
{
{
action->setChecked( true );
}
- MenuItemData *itemData = new MenuItemData( i_object_id, i_val_type,
+ MenuItemData *itemData = new MenuItemData( object, i_val_type,
val, psz_var );
CONNECT( action, triggered(), THEDP->menusMapper, map() );
THEDP->menusMapper->setMapping( action, itemData );
void QVLCMenu::DoAction( intf_thread_t *p_intf, QObject *data )
{
MenuItemData *itemData = qobject_cast<MenuItemData *>( data );
- vlc_object_t *p_object = ( vlc_object_t * )vlc_object_get( p_intf,
- itemData->i_object_id );
- if( p_object == NULL ) return;
-
- var_Set( p_object, itemData->psz_var, itemData->val );
- vlc_object_release( p_object );
+ var_Set( itemData->obj, itemData->psz_var, itemData->val );
}
projects / vlc / blobdiff