From 434242adb5dc045faf16f8bb19aa740732cc3345 Mon Sep 17 00:00:00 2001
From: Marcoen Hirschberg <m.hirschberg@activevideo.com>
Date: Tue, 27 May 2014 00:15:41 +0200
Subject: audio: rename i_bps to 'bitrate' to avoid confusion

Since i_bps now contains bits/sec, rename it to reflect this change.
---
 audio/decode/ad_lavc.c   | 6 +++---
 audio/decode/ad_mpg123.c | 4 ++--
 audio/decode/dec_audio.h | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'audio')

diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c
index b013400cab..a55a5966ae 100644
--- a/audio/decode/ad_lavc.c
+++ b/audio/decode/ad_lavc.c
@@ -229,7 +229,7 @@ static int init(struct dec_audio *da, const char *decoder)
 
     lavc_context->codec_tag = sh->format;
     lavc_context->sample_rate = sh_audio->samplerate;
-    lavc_context->bit_rate = sh_audio->i_bps;
+    lavc_context->bit_rate = sh_audio->bitrate;
     lavc_context->channel_layout = mp_chmap_to_lavc(&sh_audio->channels);
 
     if (sh_audio->wf)
@@ -270,9 +270,9 @@ static int init(struct dec_audio *da, const char *decoder)
         }
     }
 
-    da->i_bps = lavc_context->bit_rate;
+    da->bitrate = lavc_context->bit_rate;
     if (sh_audio->wf && sh_audio->wf->nAvgBytesPerSec)
-        da->i_bps = sh_audio->wf->nAvgBytesPerSec * 8;
+        da->bitrate = sh_audio->wf->nAvgBytesPerSec * 8;
 
     return 1;
 }
diff --git a/audio/decode/ad_mpg123.c b/audio/decode/ad_mpg123.c
index 3c76eb51b3..7b174aa0d6 100644
--- a/audio/decode/ad_mpg123.c
+++ b/audio/decode/ad_mpg123.c
@@ -278,12 +278,12 @@ static void update_info(struct dec_audio *da)
             /* Might not be numerically optimal, but works fine enough. */
             con->mean_rate = ((con->mean_count - 1) * con->mean_rate +
                               bitrate) / con->mean_count;
-            da->i_bps = (int) (con->mean_rate + 0.5);
+            da->bitrate = (int) (con->mean_rate + 0.5);
 
             con->delay = 10;
         }
     } else {
-        da->i_bps = bitrate ? bitrate : compute_bitrate(&finfo);
+        da->bitrate = bitrate ? bitrate : compute_bitrate(&finfo);
         con->delay      = 1;
         con->mean_rate  = 0.;
         con->mean_count = 0;
diff --git a/audio/decode/dec_audio.h b/audio/decode/dec_audio.h
index dc7446bd0d..9108f6f035 100644
--- a/audio/decode/dec_audio.h
+++ b/audio/decode/dec_audio.h
@@ -42,7 +42,7 @@ struct dec_audio {
     struct mp_audio decoded;    // format of decoded audio (no data, temporarily
                                 // different from decode_buffer during format
                                 // changes)
-    int i_bps;                  // input bitrate, can change with VBR sources
+    int bitrate;                // input bitrate, can change with VBR sources
     // last known pts value in output from decoder
     double pts;
     // number of samples output by decoder after last known pts
-- 
cgit v1.2.3