[vlc-devel] commit: Use previous helpers ( Rémi Denis-Courmont )

git version control git at videolan.org
Mon Jan 19 17:50:02 CET 2009


vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Mon Jan 19 18:48:00 2009 +0200| [1cdcdc9544d9a4a6533054a15231d3453c455900] | committer: Rémi Denis-Courmont 

Use previous helpers

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1cdcdc9544d9a4a6533054a15231d3453c455900
---

 modules/gui/qt4/input_manager.cpp |   17 ++---------------
 1 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index 8978060..9dea8e8 100644
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -850,25 +850,12 @@ MainInputManager::~MainInputManager()
 
 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;
+    return p_input ? input_GetVout( p_input ) : 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;
+    return p_input ? input_GetAout( p_input ) : NULL;
 }
 
 void MainInputManager::customEvent( QEvent *event )




More information about the vlc-devel mailing list