[vlc-devel] commit: Qt4: Deinline get(Aout|Vout)() (Jean-Baptiste Kempf )
git version control
git at videolan.org
Mon Jan 19 17:29:30 CET 2009
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Jan 19 17:27:36 2009 +0100| [45052c779b3005170e4b590c5f74d647c319ebad] | committer: Jean-Baptiste Kempf
Qt4: Deinline get(Aout|Vout)()
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=45052c779b3005170e4b590c5f74d647c319ebad
---
modules/gui/qt4/input_manager.cpp | 23 +++++++++++++++++++++++
modules/gui/qt4/input_manager.hpp | 24 +++---------------------
2 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index ab1f212..8978060 100644
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -848,6 +848,29 @@ MainInputManager::~MainInputManager()
var_DelCallback( THEPL, "playlist-current", PLItemChanged, this );
}
+vout_thread_t* MainInputManager::getVout()
+{
+ vout_thread_t **pp_vout; int i_vout;
+ if( p_input && !input_Control( p_input, INPUT_GET_VOUTS, &pp_vout, &i_vout ) )
+ {
+ for( int i = 1; i < i_vout; i++ ) vlc_object_release( pp_vout[i]);
+ vout_thread_t *p_tmp = pp_vout[0];
+ free( pp_vout );
+ return p_tmp;
+ }
+ return NULL;
+}
+
+aout_instance_t * MainInputManager::getAout()
+{
+ aout_instance_t *p_aout;
+ if( p_input && !input_Control( p_input, INPUT_GET_AOUT, &p_aout ) )
+ {
+ return p_aout;
+ }
+ return NULL;
+}
+
void MainInputManager::customEvent( QEvent *event )
{
int type = event->type();
diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
index d8df234..b153d15 100644
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -208,28 +208,10 @@ public:
input_thread_t *getInput() { return p_input; };
InputManager *getIM() { return im; };
- vout_thread_t * getVout()
- {
- vout_thread_t **pp_vout; int i_vout;
- if( p_input && !input_Control( p_input, INPUT_GET_VOUTS, &pp_vout, &i_vout ) )
- {
- for( int i = 1; i < i_vout; i++ ) vlc_object_release( pp_vout[i]);
- vout_thread_t *p_tmp = pp_vout[0];
- free( pp_vout );
- return p_tmp;
- }
- return NULL;
- }
- aout_instance_t *getAout()
- {
- aout_instance_t *p_aout;
- if( p_input && !input_Control( p_input, INPUT_GET_AOUT, &p_aout ) )
- {
- return p_aout;
- }
- return NULL;
- }
+ vout_thread_t* getVout();
+ aout_instance_t *getAout();
+
private:
MainInputManager( intf_thread_t * );
static MainInputManager *instance;
More information about the vlc-devel
mailing list