Commit 7f120f79 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Qt4: do not use vlc_object_get

parent 602005bd
This diff is collapsed.
...@@ -49,9 +49,10 @@ class MenuItemData : public QObject ...@@ -49,9 +49,10 @@ class MenuItemData : public QObject
Q_OBJECT Q_OBJECT
public: public:
MenuItemData( int i_id, int _i_type, vlc_value_t _val, const char *_var ) MenuItemData( vlc_object_t *_obj, int _i_type, vlc_value_t _val,
const char *_var )
{ {
i_object_id = i_id; obj = _obj;
i_val_type = _i_type; i_val_type = _i_type;
val = _val; val = _val;
psz_var = strdup( _var ); psz_var = strdup( _var );
...@@ -62,7 +63,7 @@ public: ...@@ -62,7 +63,7 @@ public:
if( ( i_val_type & VLC_VAR_TYPE) == VLC_VAR_STRING ) if( ( i_val_type & VLC_VAR_TYPE) == VLC_VAR_STRING )
free( val.psz_string ); free( val.psz_string );
} }
int i_object_id; vlc_object_t *obj;
int i_val_type; int i_val_type;
vlc_value_t val; vlc_value_t val;
char *psz_var; char *psz_var;
...@@ -102,11 +103,12 @@ public: ...@@ -102,11 +103,12 @@ public:
private: private:
/* Generic automenu methods */ /* Generic automenu methods */
static QMenu * Populate( intf_thread_t *, QMenu *current, static QMenu * Populate( intf_thread_t *, QMenu *current,
vector<const char*>&, vector<int>&, vector<const char*>&, vector<vlc_object_t *>&,
bool append = false ); bool append = false );
static void CreateAndConnect( QMenu *, const char *, QString, QString, static void CreateAndConnect( QMenu *, const char *, QString, QString,
int, int, vlc_value_t, int, bool c = false ); int, vlc_object_t *, vlc_value_t, int,
bool c = false );
static void CreateItem( QMenu *, const char *, vlc_object_t *, bool ); static void CreateItem( QMenu *, const char *, vlc_object_t *, bool );
static int CreateChoicesMenu( QMenu *,const char *, vlc_object_t *, bool ); static int CreateChoicesMenu( QMenu *,const char *, vlc_object_t *, bool );
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment