Inline and simplify aout_FormatNbChannels

[vlc] / src / audio_output / common.c

diff --git a/src/audio_output/common.c b/src/audio_output/common.c
index b073426050b5c500e7f6e144bebd9d4a535166ec..1c3cb2711f1f84128f37172893a194d6f81d376e 100644 (file)
--- a/src/audio_output/common.c
+++ b/src/audio_output/common.c
@@ -178,25 +178,6 @@ void aout_unlock (unsigned i)
  * Formats management (internal and external)
  */
 
-/*****************************************************************************
- * aout_FormatNbChannels : return the number of channels
- *****************************************************************************/
-unsigned int aout_FormatNbChannels( const audio_sample_format_t * p_format )
-{
-    static const uint32_t pi_channels[] =
-        { AOUT_CHAN_CENTER, AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
-          AOUT_CHAN_REARCENTER, AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,
-          AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT, AOUT_CHAN_LFE };
-    unsigned int i_nb = 0, i;
-
-    for ( i = 0; i < sizeof(pi_channels)/sizeof(uint32_t); i++ )
-    {
-        if ( p_format->i_physical_channels & pi_channels[i] ) i_nb++;
-    }
-
-    return i_nb;
-}
-
 /*****************************************************************************
  * aout_BitsPerSample : get the number of bits per sample
  *****************************************************************************/