diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-12-27 17:30:15 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-12-27 17:30:15 +0000 |
| commit | 507121f7fe2d170dd8db99d3112602036ddef718 (patch) | |
| tree | 38b26e115cfadde356b005496286f78307839440 /libaf/af_volume.c | |
| parent | 00f99a82a8f57573e3e6982cf9d014c9b9d8a68b (diff) | |
| download | mpv-507121f7fe2d170dd8db99d3112602036ddef718.tar.bz2 mpv-507121f7fe2d170dd8db99d3112602036ddef718.tar.xz | |
removing AFMT_ dependancy
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14246 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libaf/af_volume.c')
| -rw-r--r-- | libaf/af_volume.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libaf/af_volume.c b/libaf/af_volume.c index 6c3d73be65..e6221fe51a 100644 --- a/libaf/af_volume.c +++ b/libaf/af_volume.c @@ -60,8 +60,8 @@ static int control(struct af_instance_s* af, int cmd, void* arg) af->data->rate = ((af_data_t*)arg)->rate; af->data->nch = ((af_data_t*)arg)->nch; - if(s->fast && (((af_data_t*)arg)->format != (AF_FORMAT_F | AF_FORMAT_NE))){ - af->data->format = AF_FORMAT_SI | AF_FORMAT_NE; + if(s->fast && (((af_data_t*)arg)->format != (AF_FORMAT_FLOAT_NE))){ + af->data->format = AF_FORMAT_S16_NE; af->data->bps = 2; } else{ @@ -70,7 +70,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg) float t = 2.0-cos(x); s->time = 1.0 - (t - sqrt(t*t - 1)); af_msg(AF_MSG_DEBUG0,"[volume] Forgetting factor = %0.5f\n",s->time); - af->data->format = AF_FORMAT_F | AF_FORMAT_NE; + af->data->format = AF_FORMAT_FLOAT_NE; af->data->bps = 4; } return af_test_output(af,(af_data_t*)arg); @@ -140,7 +140,7 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data) register int i = 0; // Basic operation volume control only (used on slow machines) - if(af->data->format == (AF_FORMAT_SI | AF_FORMAT_NE)){ + if(af->data->format == (AF_FORMAT_S16_NE)){ int16_t* a = (int16_t*)c->audio; // Audio data int len = c->len/2; // Number of samples for(ch = 0; ch < nch ; ch++){ @@ -154,7 +154,7 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data) } } // Machine is fast and data is floating point - else if(af->data->format == (AF_FORMAT_F | AF_FORMAT_NE)){ + else if(af->data->format == (AF_FORMAT_FLOAT_NE)){ float* a = (float*)c->audio; // Audio data int len = c->len/4; // Number of samples for(ch = 0; ch < nch ; ch++){ |