[vlc-commits] playlist: playlist_GetAout returns an audio_output_t *

Rémi Denis-Courmont git at videolan.org
Wed Mar 6 21:57:47 CET 2019


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Mar  6 21:17:15 2019 +0200| [2be48939dcda3c0090a6a3b3441478b2a97d0f25] | committer: Rémi Denis-Courmont

playlist: playlist_GetAout returns an audio_output_t *

Remove casts to vlc_object_t.

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

 modules/control/oldrc.c                       |  2 +-
 modules/gui/qt/components/extended_panels.cpp | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/control/oldrc.c b/modules/control/oldrc.c
index c5349934c5..8ee6935830 100644
--- a/modules/control/oldrc.c
+++ b/modules/control/oldrc.c
@@ -1652,7 +1652,7 @@ static int AudioChannel( vlc_object_t *obj, char const *cmd,
                          vlc_value_t old, vlc_value_t cur, void *dummy )
 {
     intf_thread_t *p_intf = (intf_thread_t*)obj;
-    vlc_object_t *p_aout = (vlc_object_t *)playlist_GetAout( pl_Get(p_intf) );
+    audio_output_t *p_aout = playlist_GetAout( pl_Get(p_intf) );
     if ( p_aout == NULL )
          return VLC_ENOOBJ;
 
diff --git a/modules/gui/qt/components/extended_panels.cpp b/modules/gui/qt/components/extended_panels.cpp
index f9594266a8..f170357687 100644
--- a/modules/gui/qt/components/extended_panels.cpp
+++ b/modules/gui/qt/components/extended_panels.cpp
@@ -873,7 +873,7 @@ void FilterSliderData::updateText( int i )
 
 float FilterSliderData::initialValue()
 {
-    vlc_object_t *p_aout = (vlc_object_t *) THEMIM->getAout();
+    audio_output_t *p_aout = THEMIM->getAout();
     float f = p_data->f_value;
     if( p_aout )
     {
@@ -900,7 +900,7 @@ float FilterSliderData::initialValue()
 void FilterSliderData::onValueChanged( int i )
 {
     float f = ((float) i) * p_data->f_resolution;
-    vlc_object_t *p_aout = (vlc_object_t *) THEMIM->getAout();
+    audio_output_t *p_aout = THEMIM->getAout();
     if ( p_aout )
     {
         var_SetFloat( p_aout, qtu(p_data->name), f );
@@ -1012,7 +1012,7 @@ EqualizerSliderData::EqualizerSliderData( QObject *parent, intf_thread_t *_p_int
 
 QStringList EqualizerSliderData::getBandsFromAout() const
 {
-    vlc_object_t *p_aout = (vlc_object_t *) THEMIM->getAout();
+    audio_output_t *p_aout = THEMIM->getAout();
     QStringList bands;
     if( p_aout )
     {
@@ -1062,7 +1062,7 @@ void EqualizerSliderData::onValueChanged( int i )
     {
         float f = ((float) i) * p_data->f_resolution;
         bands[ index ] = QLocale( QLocale::C ).toString( f );
-        vlc_object_t *p_aout = (vlc_object_t *) THEMIM->getAout();
+        audio_output_t *p_aout = THEMIM->getAout();
         if ( p_aout )
         {
             var_SetString( p_aout, qtu(p_data->name), qtu(bands.join( " " )) );
@@ -1196,7 +1196,7 @@ void Equalizer::build()
     CONNECT( ui.presetsCombo, activated(int), this, setCorePreset(int) );
 
     /* Set enable checkbox */
-    vlc_object_t *p_aout = (vlc_object_t *)THEMIM->getAout();
+    audio_output_t *p_aout = THEMIM->getAout();
     char *psz_af;
     if( p_aout )
         psz_af = var_GetNonEmptyString( p_aout, "audio-filter" );
@@ -1243,7 +1243,7 @@ void Equalizer::setCorePreset( int i_preset )
                             sliderDatas.count() ) ; i++ )
         sliderDatas[i]->setValue( eqz_preset_10b[i_preset].f_amp[i] );
 
-    vlc_object_t *p_aout = (vlc_object_t *)THEMIM->getAout();
+    audio_output_t *p_aout = THEMIM->getAout();
     if( p_aout )
     {
         var_SetString( p_aout , "equalizer-preset" , preset_list[i_preset] );
@@ -1255,7 +1255,7 @@ void Equalizer::setCorePreset( int i_preset )
 /* Function called when the set2Pass button is activated */
 void Equalizer::enable2Pass( bool b_enable )
 {
-    vlc_object_t *p_aout= (vlc_object_t *)THEMIM->getAout();
+    audio_output_t *p_aout= THEMIM->getAout();
 
     if( p_aout )
     {



More information about the vlc-commits mailing list