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

Revert "Qt4: do not use vlc_object_get"

Qt4 (and a bunch of other GUIs, I suspect) needs to reference the audio
output properly, but they don't. As such, we need to keep the loosy,
slow and broken vlc_object_get() usage.

This reverts commit 7f120f79.
parent 4619c0a5
This diff is collapsed.
...@@ -49,10 +49,9 @@ class MenuItemData : public QObject ...@@ -49,10 +49,9 @@ class MenuItemData : public QObject
Q_OBJECT Q_OBJECT
public: public:
MenuItemData( vlc_object_t *_obj, int _i_type, vlc_value_t _val, MenuItemData( int i_id, int _i_type, vlc_value_t _val, const char *_var )
const char *_var )
{ {
obj = _obj; i_object_id = i_id;
i_val_type = _i_type; i_val_type = _i_type;
val = _val; val = _val;
psz_var = strdup( _var ); psz_var = strdup( _var );
...@@ -63,7 +62,7 @@ public: ...@@ -63,7 +62,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 );
} }
vlc_object_t *obj; int i_object_id;
int i_val_type; int i_val_type;
vlc_value_t val; vlc_value_t val;
char *psz_var; char *psz_var;
...@@ -103,12 +102,11 @@ public: ...@@ -103,12 +102,11 @@ 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<vlc_object_t *>&, vector<const char*>&, vector<int>&,
bool append = false ); bool append = false );
static void CreateAndConnect( QMenu *, const char *, QString, QString, static void CreateAndConnect( QMenu *, const char *, QString, QString,
int, vlc_object_t *, vlc_value_t, int, int, int, vlc_value_t, int, bool c = false );
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