changed BUF_AUDIO_IMAADPCM -> BUF_AUDIO_MSIMAADPCM for clarification

CVS patchset: 2039
CVS date: 2002/06/08 19:45:19

4 files changed, 11 insertions, 11 deletions

diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c
index f28682673..a061d5a53 100644
--- a/src/libw32dll/w32codec.c
+++ b/src/libw32dll/w32codec.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: w32codec.c,v 1.78 2002/05/25 19:19:19 siggi Exp $
+ * $Id: w32codec.c,v 1.79 2002/06/08 19:45:19 tmmm Exp $
  *
  * routines for using w32 codecs
  * DirectShow support by Miguel Freitas (Nov/2001)
@@ -907,7 +907,7 @@ static int w32a_can_handle (audio_decoder_t *this_gen, int buf_type) {
 
   return ( (codec == BUF_AUDIO_DIVXA) ||
 	   (codec == BUF_AUDIO_MSADPCM) ||
-	   (codec == BUF_AUDIO_IMAADPCM) ||
+	   (codec == BUF_AUDIO_MSIMAADPCM) ||
 	   (codec == BUF_AUDIO_MSGSM) ||
 	   (codec == BUF_AUDIO_IMC) ||
 	   (codec == BUF_AUDIO_LH) || 
@@ -926,7 +926,7 @@ static char* get_auds_codec_name(w32a_decoder_t *this, int buf_type) {
     return "divxa32.acm";
   case BUF_AUDIO_MSADPCM:
     return "msadp32.acm";
-  case BUF_AUDIO_IMAADPCM:
+  case BUF_AUDIO_MSIMAADPCM:
     return "imaadp32.acm";
   case BUF_AUDIO_MSGSM:
     return "msgsm32.acm";
diff --git a/src/libxineadec/adpcm.c b/src/libxineadec/adpcm.c
index 1f55c7344..e08507a95 100644
--- a/src/libxineadec/adpcm.c
+++ b/src/libxineadec/adpcm.c
@@ -24,7 +24,7 @@
  * formats can be found here:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: adpcm.c,v 1.3 2002/06/08 19:29:28 tmmm Exp $
+ * $Id: adpcm.c,v 1.4 2002/06/08 19:45:19 tmmm Exp $
  */
 
 #include <stdio.h>
@@ -773,7 +773,7 @@ static int adpcm_can_handle (audio_decoder_t *this_gen, int buf_type) {
   buf_type &= 0xFFFF0000;
 
   return ( buf_type == BUF_AUDIO_MSADPCM ||
-           buf_type == BUF_AUDIO_IMAADPCM ||
+           buf_type == BUF_AUDIO_MSIMAADPCM ||
            buf_type == BUF_AUDIO_QTIMAADPCM ||
            buf_type == BUF_AUDIO_DK3ADPCM ||
            buf_type == BUF_AUDIO_DK4ADPCM );
@@ -841,7 +841,7 @@ static void adpcm_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
             (this->in_block_size - DK3_ADPCM_PREAMBLE_SIZE) * 8 / 3;
           break;
 
-        case BUF_AUDIO_IMAADPCM:
+        case BUF_AUDIO_MSIMAADPCM:
           /* a block of IMA ADPCM stored in an MS-type file has 4
            * preamble bytes per channel. */
           this->out_block_size =
@@ -889,7 +889,7 @@ static void adpcm_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
         ms_adpcm_decode_block(this, buf);
         break;
 
-      case BUF_AUDIO_IMAADPCM:
+      case BUF_AUDIO_MSIMAADPCM:
         ms_ima_adpcm_decode_block(this, buf);
         break;
 
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index 50e8dad98..528963e25 100644
--- a/src/xine-engine/buffer.h
+++ b/src/xine-engine/buffer.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: buffer.h,v 1.48 2002/06/07 02:40:47 miguelfreitas Exp $
+ * $Id: buffer.h,v 1.49 2002/06/08 19:45:19 tmmm Exp $
  *
  *
  * contents:
@@ -123,7 +123,7 @@ extern "C" {
 #define BUF_AUDIO_DIVXA		0x03040000
 #define BUF_AUDIO_DTS		0x03050000
 #define BUF_AUDIO_MSADPCM	0x03060000
-#define BUF_AUDIO_IMAADPCM	0x03070000
+#define BUF_AUDIO_MSIMAADPCM	0x03070000
 #define BUF_AUDIO_MSGSM		0x03080000 
 #define BUF_AUDIO_VORBIS        0x03090000
 #define BUF_AUDIO_IMC           0x030a0000
diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c
index e482ddd94..4967746a5 100644
--- a/src/xine-engine/buffer_types.c
+++ b/src/xine-engine/buffer_types.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: buffer_types.c,v 1.24 2002/06/07 04:15:46 miguelfreitas Exp $
+ * $Id: buffer_types.c,v 1.25 2002/06/08 19:45:19 tmmm Exp $
  *
  *
  * contents:
@@ -454,7 +454,7 @@ static audio_db_t audio_db[] = {
   {
     0x11, 0
   },
-  BUF_AUDIO_IMAADPCM,
+  BUF_AUDIO_MSIMAADPCM,
   "MS IMA ADPCM"
 },
 {