* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#ifndef _MENUS_H_
-#define _MENUS_H_
+#ifndef QVLC_MENUS_H_
+#define QVLC_MENUS_H_
#include "qt4.hpp"
vlc_value_t _val, const char *_var ) : QObject( parent )
{
p_obj = _p_obj;
+ if( p_obj )
+ vlc_object_hold( p_obj );
i_val_type = _i_type;
val = _val;
psz_var = strdup( _var );
free( psz_var );
if( ( i_val_type & VLC_VAR_TYPE) == VLC_VAR_STRING )
free( val.psz_string );
+ if( p_obj )
+ vlc_object_release( p_obj );
}
vlc_object_t *p_obj;
public:
/* Main bar creation */
- static void createMenuBar( MainInterface *mi, intf_thread_t *, bool );
+ static void createMenuBar( MainInterface *mi, intf_thread_t * );
/* Popups Menus */
static void PopupMenu( intf_thread_t *, bool );
/* Actions */
static void DoAction( QObject * );
- /* HACK for minimalView */
- static QAction *minimalViewAction;
-
private:
/* All main Menus */
- static QMenu *FileMenu( intf_thread_t * );
- static QMenu *SDMenu( intf_thread_t * );
- static QMenu *ToolsMenu( intf_thread_t * );
- static QMenu *ViewMenu( intf_thread_t *, QMenu *, MainInterface *,
- bool, bool with = true );
+ static QMenu *FileMenu( intf_thread_t *, QWidget * );
+ static QMenu *SDMenu( intf_thread_t *, QWidget * );
+
+ static QMenu *ToolsMenu( QMenu * );
+ static QMenu *ToolsMenu( QWidget * );
+
+ static QMenu *ViewMenu( intf_thread_t *, MainInterface *,
+ bool with = true );
+ static QMenu *InterfacesMenu( intf_thread_t *p_intf, QMenu * );
+
static QMenu *NavigMenu( intf_thread_t *, QMenu * );
+ static QMenu *NavigMenu( intf_thread_t *, QWidget * );
+ static QMenu *RebuildNavigMenu( intf_thread_t *, QMenu *);
+
static QMenu *VideoMenu( intf_thread_t *, QMenu * );
+ static QMenu *VideoMenu( intf_thread_t *, QWidget * );
+
static QMenu *AudioMenu( intf_thread_t *, QMenu * );
- static QMenu *InterfacesMenu( intf_thread_t *p_intf, QMenu * );
- static QMenu *HelpMenu( QMenu * );
+ static QMenu *AudioMenu( intf_thread_t *, QWidget * );
+
+ static QMenu *HelpMenu( QWidget * );
/* Popups Menus */
static void PopupMenuStaticEntries( QMenu *menu );
- static void PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf,
+ static void PopupPlayEntries( QMenu *menu, intf_thread_t *p_intf,
input_thread_t *p_input );
+ static void PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf );
+ static void PopupMenuPlaylistControlEntries( QMenu *menu, intf_thread_t *p_intf );
+
/* Generic automenu methods */
static QMenu * Populate( intf_thread_t *, QMenu *current,
vector<const char*>&, vector<vlc_object_t *>& );
- static void CreateAndConnect( QMenu *, const char *, QString, QString,
- int, vlc_object_t *, vlc_value_t, int, bool c = false );
+ static void CreateAndConnect( QMenu *, const char *, const QString&,
+ const QString&, int, vlc_object_t *,
+ vlc_value_t, int, bool c = false );
static void UpdateItem( intf_thread_t *, QMenu *, const char *,
vlc_object_t *, bool );
static int CreateChoicesMenu( QMenu *,const char *, vlc_object_t *, bool );
Q_OBJECT
public:
- MenuFunc( QMenu *_menu, int _id ) { menu = _menu; id = _id; };
+ MenuFunc( QMenu *_menu, int _id ) : QObject( (QObject *)_menu ),
+ menu( _menu ), id( _id ){}
+
void doFunc( intf_thread_t *p_intf)
{
switch( id )
{
case 1: QVLCMenu::AudioMenu( p_intf, menu ); break;
case 2: QVLCMenu::VideoMenu( p_intf, menu ); break;
- case 3: QVLCMenu::NavigMenu( p_intf, menu ); break;
+ case 3: QVLCMenu::RebuildNavigMenu( p_intf, menu ); break;
case 4: QVLCMenu::InterfacesMenu( p_intf, menu ); break;
}
- };
+ }
private:
- int id;
QMenu *menu;
+ int id;
};
#endif