From: RĂ©mi Denis-Courmont Date: Sat, 23 May 2009 16:15:32 +0000 (+0300) Subject: Move intf_sys_t and intf_thread_t definitions X-Git-Tag: 1.1.0-ff~5806 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=9e8ea4a66948f20483ffdda1d9eb83f3798d2dd1;p=vlc Move intf_sys_t and intf_thread_t definitions --- diff --git a/include/vlc_common.h b/include/vlc_common.h index f75611ffb4..88b938bc42 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -176,10 +176,6 @@ typedef struct module_cache_t module_cache_t; typedef struct config_category_t config_category_t; -/* Interface */ -typedef struct intf_thread_t intf_thread_t; -typedef struct intf_sys_t intf_sys_t; - /* Input */ typedef struct input_thread_t input_thread_t; typedef struct input_thread_sys_t input_thread_sys_t; diff --git a/include/vlc_interface.h b/include/vlc_interface.h index fae34b527e..b59bd9da1e 100644 --- a/include/vlc_interface.h +++ b/include/vlc_interface.h @@ -44,8 +44,10 @@ typedef struct intf_dialog_args_t intf_dialog_args_t; * @{ */ +typedef struct intf_sys_t intf_sys_t; + /** Describe all interface-specific data of the interface thread */ -struct intf_thread_t +typedef struct intf_thread_t { VLC_COMMON_MEMBERS @@ -60,14 +62,14 @@ struct intf_thread_t /** Interface module */ module_t * p_module; - void ( *pf_run ) ( intf_thread_t * ); /** Run function */ + void ( *pf_run ) ( struct intf_thread_t * ); /** Run function */ /** Specific for dialogs providers */ - void ( *pf_show_dialog ) ( intf_thread_t *, int, int, + void ( *pf_show_dialog ) ( struct intf_thread_t *, int, int, intf_dialog_args_t * ); config_chain_t *p_cfg; -}; +} intf_thread_t; /** \brief Arguments passed to a dialogs provider * This describes the arguments passed to the dialogs provider. They are diff --git a/modules/gui/qt4/components/extended_panels.hpp b/modules/gui/qt4/components/extended_panels.hpp index 3d498c7dca..5568ea71b5 100644 --- a/modules/gui/qt4/components/extended_panels.hpp +++ b/modules/gui/qt4/components/extended_panels.hpp @@ -48,7 +48,7 @@ class ExtVideo: public QObject Q_OBJECT friend class ExtendedDialog; public: - ExtVideo( intf_thread_t *, QTabWidget * ); + ExtVideo( struct intf_thread_t *, QTabWidget * ); virtual ~ExtVideo(); /*void gotoConf( QObject* );*/ private: