/*****************************************************************************
* Definitions of variables for the dynamic menus
*****************************************************************************/
-#define PUSH_VAR( var ) varnames.append( var ); \
- objects.append( VLC_OBJECT(p_object) )
-
-#define PUSH_INPUTVAR( var ) varnames.append( var ); \
- objects.append( VLC_OBJECT(p_input) );
-
-static int InputAutoMenuBuilder( input_thread_t *p_object,
- QVector<vlc_object_t *> &objects,
- QVector<const char *> &varnames )
+#define PUSH_OBJVAR(object,var) \
+ do { \
+ varnames.append(var); \
+ objects.append(VLC_OBJECT(object)); \
+ } while (0)
+
+#define PUSH_VAR(var) PUSH_OBJVAR(p_object, var)
+#define PUSH_INPUTVAR(var) PUSH_OBJVAR(p_input, var)
+#define PUSH_PLVAR(var) PUSH_OBJVAR(pl, var)
+
+static int InputAutoMenuBuilder( input_thread_t *p_input,
+ QVector<vlc_object_t *> &objects, QVector<const char *> &varnames )
{
- PUSH_VAR( "bookmark" );
- PUSH_VAR( "title" );
- PUSH_VAR( "chapter" );
- PUSH_VAR( "program" );
+ PUSH_INPUTVAR( "bookmark" );
+ PUSH_INPUTVAR( "title" );
+ PUSH_INPUTVAR( "chapter" );
+ PUSH_INPUTVAR( "program" );
+
return VLC_SUCCESS;
}
-static int VideoAutoMenuBuilder( vout_thread_t *p_object,
- input_thread_t *p_input,
- QVector<vlc_object_t *> &objects,
- QVector<const char *> &varnames )
+static int VideoAutoMenuBuilder( playlist_t *pl, input_thread_t *p_input,
+ QVector<vlc_object_t *> &objects, QVector<const char *> &varnames )
{
+ vout_thread_t *p_object = p_input ? input_GetVout( p_input ) : NULL;
+
PUSH_INPUTVAR( "video-es" );
- PUSH_VAR( "fullscreen" );
- PUSH_VAR( "video-on-top" );
- PUSH_VAR( "video-wallpaper" );
+ PUSH_PLVAR( "fullscreen" );
+ PUSH_PLVAR( "video-on-top" );
+ PUSH_PLVAR( "video-wallpaper" );
PUSH_VAR( "video-snapshot" );
PUSH_VAR( "zoom" );
PUSH_VAR( "autoscale" );
PUSH_VAR( "deinterlace-mode" );
PUSH_VAR( "postprocess" );
+ if( p_object )
+ vlc_object_release( p_object );
return VLC_SUCCESS;
}
-static int SubsAutoMenuBuilder( input_thread_t *p_object,
- QVector<vlc_object_t *> &objects,
- QVector<const char *> &varnames )
+static int SubsAutoMenuBuilder( input_thread_t *p_input,
+ QVector<vlc_object_t *> &objects, QVector<const char *> &varnames )
{
- PUSH_VAR( "spu-es" );
+ PUSH_INPUTVAR( "spu-es" );
return VLC_SUCCESS;
}
-
-
-static int AudioAutoMenuBuilder( audio_output_t *p_object,
- input_thread_t *p_input,
- QVector<vlc_object_t *> &objects,
- QVector<const char *> &varnames )
+static int AudioAutoMenuBuilder( input_thread_t *p_input,
+ QVector<vlc_object_t *> &objects, QVector<const char *> &varnames )
{
+ audio_output_t *p_object = p_input ? input_GetAout( p_input ) : NULL;
+
PUSH_INPUTVAR( "audio-es" );
PUSH_VAR( "stereo-mode" );
PUSH_VAR( "visual" );
+
+ if( p_object )
+ vlc_object_release( p_object );
return VLC_SUCCESS;
}
}
menu->addSeparator();
- addDPStaticEntry( menu, qtr( I_PL_SAVE ), "", SLOT( saveAPlaylist() ),
+ addDPStaticEntry( menu, qtr( I_PL_SAVE ), "", SLOT( savePlayingToPlaylist() ),
"Ctrl+Y" );
#ifdef ENABLE_SOUT
action->setCheckable( true );
action->setChecked( THEMIM->getPlayExitState() );
- if( mi->getSysTray() )
+ if( mi && mi->getSysTray() )
{
action = menu->addAction( qtr( "Close to systray"), mi,
SLOT( toggleUpdateSystrayMenu() ) );
{
current->addSeparator();
- QAction *action = current->addAction( qtr( "&Increase Volume" ),
+ QAction *action = current->addAction( QIcon( ":/toolbar/volume-high" ), qtr( "&Increase Volume" ),
ActionsManager::getInstance( p_intf ), SLOT( AudioUp() ) );
action->setData( VLCMenuBar::ACTION_STATIC );
- action = current->addAction( qtr( "&Decrease Volume" ),
+ action = current->addAction( QIcon( ":/toolbar/volume-low" ), qtr( "&Decrease Volume" ),
ActionsManager::getInstance( p_intf ), SLOT( AudioDown() ) );
action->setData( VLCMenuBar::ACTION_STATIC );
- action = current->addAction( qtr( "&Mute" ),
+ action = current->addAction( QIcon( ":/toolbar/volume-muted" ), qtr( "&Mute" ),
ActionsManager::getInstance( p_intf ), SLOT( toggleMuteAudio() ) );
action->setData( VLCMenuBar::ACTION_STATIC );
}
if( current->isEmpty() )
{
addActionWithSubmenu( current, "audio-es", qtr( "Audio &Track" ) );
- audioDeviceMenu = current->addMenu( qtr( "Audio &Device" ) );
+ audioDeviceMenu = new QMenu( qtr( "Audio &Device" ) );
+ current->addMenu( audioDeviceMenu );
addActionWithSubmenu( current, "stereo-mode", qtr( "&Stereo Mode" ) );
current->addSeparator();
p_input = THEMIM->getInput();
p_aout = THEMIM->getAout();
EnableStaticEntries( current, ( p_aout != NULL ) );
- AudioAutoMenuBuilder( p_aout, p_input, objects, varnames );
+ AudioAutoMenuBuilder( p_input, objects, varnames );
updateAudioDevice( p_intf, p_aout, audioDeviceMenu );
if( p_aout )
{
}
/* Subtitles */
-QMenu *VLCMenuBar::SubtitleMenu( intf_thread_t *p_intf, QMenu *current )
+QMenu *VLCMenuBar::SubtitleMenu( intf_thread_t *p_intf, QMenu *current, bool b_popup )
{
input_thread_t *p_input;
QVector<vlc_object_t *> objects;
QVector<const char *> varnames;
- if( current->isEmpty() )
+ if( current->isEmpty() || b_popup )
{
addDPStaticEntry( current, qtr( "Add &Subtitle File..." ), "",
SLOT( loadSubtitlesFile() ) );
**/
QMenu *VLCMenuBar::VideoMenu( intf_thread_t *p_intf, QMenu *current )
{
- vout_thread_t *p_vout;
input_thread_t *p_input;
QVector<vlc_object_t *> objects;
QVector<const char *> varnames;
p_input = THEMIM->getInput();
- p_vout = THEMIM->getVout();
- VideoAutoMenuBuilder( p_vout, p_input, objects, varnames );
-
- if( p_vout )
- vlc_object_release( p_vout );
+ VideoAutoMenuBuilder( THEPL, p_input, objects, varnames );
return Populate( p_intf, current, varnames, objects );
}
* Popup menus - Right Click menus *
*****************************************************************************/
#define POPUP_BOILERPLATE \
- static QMenu* menu = NULL; \
- delete menu; menu = NULL; \
- if( !show ) \
- return; \
+ QMenu* menu; \
QVector<vlc_object_t *> objects; \
QVector<const char *> varnames; \
input_thread_t *p_input = THEMIM->getInput();
#define CREATE_POPUP \
menu = new QMenu(); \
Populate( p_intf, menu, varnames, objects ); \
- menu->popup( QCursor::pos() ); \
+ if( show ) \
+ menu->popup( QCursor::pos() ); \
void VLCMenuBar::PopupMenuPlaylistEntries( QMenu *menu,
intf_thread_t *p_intf,
action->setData( ACTION_NO_CLEANUP + ACTION_DELETE_ON_REBUILD );
CONNECT( THEMIM, playlistNotEmpty(bool), action, setEnabled(bool) );
+ action = menu->addAction( qtr( "Record" ), THEAM, SLOT( record() ) );
+ action->setIcon( QIcon( ":/toolbar/record" ) );
+ if( !p_input )
+ action->setEnabled( false );
+ action->setData( ACTION_NO_CLEANUP + ACTION_DELETE_ON_REBUILD );
menu->addSeparator();
}
action->setData( ACTION_STATIC );
}
- action = rateMenu->addAction( qtr( "Faster (fine)" ), THEMIM->getIM(),
+ action = rateMenu->addAction( QIcon( ":/toolbar/faster2" ), qtr( "Faster (fine)" ), THEMIM->getIM(),
SLOT( littlefaster() ) );
action->setData( ACTION_STATIC );
SLOT( normalRate() ) );
action->setData( ACTION_STATIC );
- action = rateMenu->addAction( qtr( "Slower (fine)" ), THEMIM->getIM(),
+ action = rateMenu->addAction( QIcon( ":/toolbar/slower2" ), qtr( "Slower (fine)" ), THEMIM->getIM(),
SLOT( littleslower() ) );
action->setData( ACTION_STATIC );
}
/* Video Tracks and Subtitles tracks */
-void VLCMenuBar::VideoPopupMenu( intf_thread_t *p_intf, bool show )
+QMenu* VLCMenuBar::VideoPopupMenu( intf_thread_t *p_intf, bool show )
{
POPUP_BOILERPLATE
if( p_input )
- {
- vout_thread_t *p_vout = THEMIM->getVout();
- if( p_vout )
- {
- VideoAutoMenuBuilder( p_vout, p_input, objects, varnames );
- vlc_object_release( p_vout );
- }
- }
+ VideoAutoMenuBuilder( THEPL, p_input, objects, varnames );
CREATE_POPUP
+ return menu;
}
/* Audio Tracks */
-void VLCMenuBar::AudioPopupMenu( intf_thread_t *p_intf, bool show )
+QMenu* VLCMenuBar::AudioPopupMenu( intf_thread_t *p_intf, bool show )
{
POPUP_BOILERPLATE
if( p_input )
- {
- audio_output_t *p_aout = THEMIM->getAout();
- AudioAutoMenuBuilder( p_aout, p_input, objects, varnames );
- if( p_aout )
- vlc_object_release( p_aout );
- }
+ AudioAutoMenuBuilder( p_input, objects, varnames );
CREATE_POPUP
+ return menu;
}
/* Navigation stuff, and general menus ( open ), used only for skins */
-void VLCMenuBar::MiscPopupMenu( intf_thread_t *p_intf, bool show )
+QMenu* VLCMenuBar::MiscPopupMenu( intf_thread_t *p_intf, bool show )
{
POPUP_BOILERPLATE
menu->addSeparator();
PopupMenuStaticEntries( menu );
- menu->popup( QCursor::pos() );
+ if( show )
+ menu->popup( QCursor::pos() );
+ return menu;
}
/* Main Menu that sticks everything together */
-void VLCMenuBar::PopupMenu( intf_thread_t *p_intf, bool show )
+QMenu* VLCMenuBar::PopupMenu( intf_thread_t *p_intf, bool show )
{
POPUP_BOILERPLATE
val.b_bool = false;
CreateAndConnect( menu, "fullscreen",
qtr( "Leave Fullscreen" ),"" , ITEM_NORMAL,
- VLC_OBJECT(p_vout), val, VLC_VAR_BOOL, b_isFullscreen );
+ VLC_OBJECT(THEPL), val, VLC_VAR_BOOL, b_isFullscreen );
}
vlc_object_release( p_vout );
if( action->menu()->isEmpty() )
action->setEnabled( false );
- submenu = SubtitleMenu( p_intf, menu );
- submenu->setTitle( qtr( "Subti&tle") );
- UpdateItem( p_intf, menu, "spu-es", VLC_OBJECT(p_input), true );
+ /* Subtitles menu */
+ submenu = new QMenu( menu );
+ action = menu->addMenu( SubtitleMenu( p_intf, submenu, true ) );
+ action->setText( qtr( "Subti&tle") );
+ UpdateItem( p_intf, submenu, "spu-es", VLC_OBJECT(p_input), true );
/* Playback menu for chapters */
submenu = new QMenu( menu );
/*QMenu *tools =*/ ToolsMenu( p_intf, submenu );
submenu->addSeparator();
+ if( mi )
+ {
+ QMenu *bar = menu; // Needed for next macro
+ BAR_DADD( ViewMenu( p_intf, NULL, mi ), qtr( "V&iew" ), 4 );
+ }
+
/* In skins interface, append some items */
- if( !mi )
+ if( p_intf->p_sys->b_isDialogProvider )
{
+ vlc_object_t* p_object = p_intf->p_parent;
submenu->setTitle( qtr( "Interface" ) );
- if( p_intf->p_sys->b_isDialogProvider )
- {
- /* list of skins available */
- vlc_object_t* p_object = p_intf->p_parent;
-
- objects.clear(); varnames.clear();
- objects.append( p_object );
- varnames.append( "intf-skins" );
- Populate( p_intf, submenu, varnames, objects );
- objects.clear(); varnames.clear();
- objects.append( p_object );
- varnames.append( "intf-skins-interactive" );
- Populate( p_intf, submenu, varnames, objects );
+ /* Open skin dialog box */
+ objects.clear(); varnames.clear();
+ objects.append( p_object );
+ varnames.append( "intf-skins-interactive" );
+ Populate( p_intf, submenu, varnames, objects );
+ QAction* action = submenu->actions().back();
+ action->setShortcut( QKeySequence( "Ctrl+Shift+S" ));
- submenu->addSeparator();
+ /* list of skins available */
+ objects.clear(); varnames.clear();
+ objects.append( p_object );
+ varnames.append( "intf-skins" );
+ Populate( p_intf, submenu, varnames, objects );
- /* Extensions */
- ExtensionsMenu( p_intf, submenu );
+ submenu->addSeparator();
- }
- else
- msg_Warn( p_intf, "could not find parent interface" );
- }
- else
- {
- QMenu *bar = menu; // Needed for next macro
- BAR_DADD( ViewMenu( p_intf, NULL, mi ), qtr( "V&iew" ), 4 );
+ /* list of extensions */
+ ExtensionsMenu( p_intf, submenu );
}
menu->addMenu( submenu );
menu->addMenu( plMenu );
/* Static entries for ending, like open */
- PopupMenuStaticEntries( menu );
+ if( p_intf->p_sys->b_isDialogProvider )
+ {
+ QMenu *openmenu = FileMenu( p_intf, menu );
+ openmenu->setTitle( qtr( "Open Media" ) );
+ menu->addMenu( openmenu );
+
+ menu->addSeparator();
- menu->popup( QCursor::pos() );
+ QMenu *helpmenu = HelpMenu( menu );
+ helpmenu->setTitle( qtr( "Help" ) );
+ menu->addMenu( helpmenu );
+
+ addDPStaticEntry( menu, qtr( "Quit" ), ":/menu/exit",
+ SLOT( quit() ), "Ctrl+Q", QAction::QuitRole );
+ }
+ else
+ PopupMenuStaticEntries( menu );
+
+ if( show )
+ menu->popup( QCursor::pos() );
+ return menu;
}
#undef CREATE_POPUP
const char *var = itemData->psz_var;
vlc_value_t val = itemData->val;
- /* Preserve settings across vouts via the playlist object: */
- if( !strcmp( var, "fullscreen" )
- || !strcmp( var, "video-on-top" ) )
- var_Set( pl_Get( p_object ), var, val );
-
if ((var_Type( p_object, var) & VLC_VAR_CLASS) == VLC_VAR_VOID)
var_TriggerCallback( p_object, var );
else
var_Set( p_object, var, val );
+
+ if( !strcmp( var, "fullscreen" )
+ || !strcmp( var, "video-on-top" )
+ || !strcmp( var, "video-wallpaper" ) ) /* FIXME: reverse abstraction */
+ { /* Apply playlist variables to current existing vout too */
+ input_thread_t *input = playlist_CurrentInput((playlist_t *)p_object);
+ if( input != NULL )
+ {
+ vout_thread_t *vout = input_GetVout( input );
+ vlc_object_release( input );
+ if( vout != NULL )
+ {
+ var_Set( vout, var, val ); /* never void class */
+ vlc_object_release( vout );
+ }
+ }
+ }
}
void VLCMenuBar::updateAudioDevice( intf_thread_t * p_intf, audio_output_t *p_aout, QMenu *current )
char **ids, **names;
char *selected;
- if( !p_aout )
+ if( !p_aout || !current )
return;
current->clear();
{
QAction* action;
RecentsMRL* rmrl = RecentsMRL::getInstance( p_intf );
- QStringList l = rmrl->recents();
+ QStringList l = rmrl->recentList();
recentsMenu->clear();
}
else
{
- for( int i = 0; i < l.count(); ++i )
+ for( int i = 0; i < __MIN( l.count(), 10) ; ++i )
{
QString mrl = l.at( i );
char *psz = decode_URI_duplicate( qtu( mrl ) );
recentsMenu->addSeparator();
recentsMenu->addAction( qtr("&Clear"), rmrl, SLOT( clear() ) );
+ addDPStaticEntry( recentsMenu, qtr("&Save To Playlist"), "", SLOT( saveRecentsToPlaylist() ), "" );
recentsMenu->setEnabled( true );
}
}
projects / vlc / blobdiff