aboutsummaryrefslogtreecommitdiffstats
path: root/mediaplugin/src/mediaplugins/include
diff options
context:
space:
mode:
authortobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-12-22 18:39:37 +0000
committertobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-12-22 18:39:37 +0000
commit513b9fc615de45378ec2f9403106767204ae3a45 (patch)
treef6010d01ec97441ab3bdd213f34bd537615cd0e1 /mediaplugin/src/mediaplugins/include
parent4b14d84ad012a23f769ce7c030ee8ab2c389108d (diff)
downloadusdx-513b9fc615de45378ec2f9403106767204ae3a45.tar.gz
usdx-513b9fc615de45378ec2f9403106767204ae3a45.tar.xz
usdx-513b9fc615de45378ec2f9403106767204ae3a45.zip
replace asf... by AUDIO_SAMPLE_FORMAT_... constants
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2769 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'mediaplugin/src/mediaplugins/include')
-rw-r--r--mediaplugin/src/mediaplugins/include/core/plugin_core.h36
-rw-r--r--mediaplugin/src/mediaplugins/include/core/util.h2
2 files changed, 21 insertions, 17 deletions
diff --git a/mediaplugin/src/mediaplugins/include/core/plugin_core.h b/mediaplugin/src/mediaplugins/include/core/plugin_core.h
index c7d078b0..69cc7f19 100644
--- a/mediaplugin/src/mediaplugins/include/core/plugin_core.h
+++ b/mediaplugin/src/mediaplugins/include/core/plugin_core.h
@@ -141,26 +141,30 @@ typedef struct pluginCore_t {
} pluginCore_t;
typedef enum audioSampleFormat_t {
- asfUnknown, // unknown format
- asfU8, asfS8, // unsigned/signed 8 bits
- asfU16LSB, asfS16LSB, // unsigned/signed 16 bits (endianness: LSB)
- asfU16MSB, asfS16MSB, // unsigned/signed 16 bits (endianness: MSB)
- asfU16, asfS16, // unsigned/signed 16 bits (endianness: System)
- asfS32, // signed 32 bits (endianness: System)
- asfFloat, // float
- asfDouble // double
+ AUDIO_SAMPLE_FORMAT_UNKNOWN, // unknown format
+ AUDIO_SAMPLE_FORMAT_U8, // unsigned 8 bits
+ AUDIO_SAMPLE_FORMAT_S8, // signed 8 bits
+ AUDIO_SAMPLE_FORMAT_U16LSB, // unsigned 16 bits (endianness: LSB)
+ AUDIO_SAMPLE_FORMAT_S16LSB, // signed 16 bits (endianness: LSB)
+ AUDIO_SAMPLE_FORMAT_U16MSB, // unsigned 16 bits (endianness: MSB)
+ AUDIO_SAMPLE_FORMAT_S16MSB, // signed 16 bits (endianness: MSB)
+ AUDIO_SAMPLE_FORMAT_U16, // unsigned 16 bits (endianness: System)
+ AUDIO_SAMPLE_FORMAT_S16, // signed 16 bits (endianness: System)
+ AUDIO_SAMPLE_FORMAT_S32, // signed 32 bits (endianness: System)
+ AUDIO_SAMPLE_FORMAT_FLOAT, // float
+ AUDIO_SAMPLE_FORMAT_DOUBLE // double
} audioSampleFormat_t;
// Size of one sample (one channel only) in bytes
static const int g_audioSampleSize[] = {
- 0, // asfUnknown
- 1, 1, // asfU8, asfS8
- 2, 2, // asfU16LSB, asfS16LSB
- 2, 2, // asfU16MSB, asfS16MSB
- 2, 2, // asfU16, asfS16
- 3, // asfS24
- 4, // asfS32
- 4, // asfFloat
+ 0, // Unknown
+ 1, 1, // U8, S8
+ 2, 2, // U16LSB, S16LSB
+ 2, 2, // U16MSB, S16MSB
+ 2, 2, // U16, S16
+ 3, // S24
+ 4, // S32
+ 4, // Float
};
typedef struct audioFormatInfo_t {
diff --git a/mediaplugin/src/mediaplugins/include/core/util.h b/mediaplugin/src/mediaplugins/include/core/util.h
index 55c5e93f..ba7ae2a4 100644
--- a/mediaplugin/src/mediaplugins/include/core/util.h
+++ b/mediaplugin/src/mediaplugins/include/core/util.h
@@ -62,7 +62,7 @@ public:
AudioFormatInfo() :
_sampleRate(0),
_channels(0),
- _format(asfUnknown),
+ _format(AUDIO_SAMPLE_FORMAT_UNKNOWN),
_frameSize(0)
{}