github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-07-11 23:47:56 +02:00
Code Releases Activity

mixer: reindent/cosmetic changes

Browse Source 
There should be no real semantic changes.

Remove the mixer_setbothvolume macro, as it was unused.
This commit is contained in:
wm4 2011-12-26 01:41:35 +01:00 committed by Uoti Urpala
parent 7040968be4
commit 7a699cea28
2 changed files with 100 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

198
mixer.c
View File

@ -17,163 +17,163 @@
*/ */
#include <string.h> #include <string.h>
#ifndef __MINGW32__
#include <sys/ioctl.h>
#endif
#include <fcntl.h>
#include <stdio.h>
#include <unistd.h>
#include "config.h" #include "config.h"
#include "libao2/audio_out.h" #include "libao2/audio_out.h"
#include "libaf/af.h" #include "libaf/af.h"
#include "mp_msg.h"
#include "mixer.h" #include "mixer.h"
char * mixer_device=NULL; char *mixer_device = NULL;
char * mixer_channel=NULL; char *mixer_channel = NULL;
int soft_vol = 0; int soft_vol = 0;
float soft_vol_max = 110.0; float soft_vol_max = 110.0;
void mixer_getvolume(mixer_t *mixer, float *l, float *r) void mixer_getvolume(mixer_t *mixer, float *l, float *r)
{ {
ao_control_vol_t vol; *l = 0;
*l=0; *r=0; *r = 0;
if (mixer->ao) { if (!mixer->ao)
if(soft_vol ||
CONTROL_OK != ao_control(mixer->ao, AOCONTROL_GET_VOLUME, &vol)) {
if (!mixer->afilter)
return; return;
else {
ao_control_vol_t vol;
if (soft_vol || CONTROL_OK != ao_control(mixer->ao, AOCONTROL_GET_VOLUME,
&vol)) {
float db_vals[AF_NCH]; float db_vals[AF_NCH];
if (!af_control_any_rev(mixer->afilter, if (!af_control_any_rev(mixer->afilter,
AF_CONTROL_VOLUME_LEVEL | AF_CONTROL_GET, db_vals)) AF_CONTROL_VOLUME_LEVEL | AF_CONTROL_GET, db_vals))
db_vals[0] = db_vals[1] = 1.0; db_vals[0] = db_vals[1] = 1.0;
else else
af_from_dB (2, db_vals, db_vals, 20.0, -200.0, 60.0); af_from_dB(2, db_vals, db_vals, 20.0, -200.0, 60.0);
vol.left = (db_vals[0] / (soft_vol_max / 100.0)) * 100.0; vol.left = (db_vals[0] / (soft_vol_max / 100.0)) * 100.0;
vol.right = (db_vals[1] / (soft_vol_max / 100.0)) * 100.0; vol.right = (db_vals[1] / (soft_vol_max / 100.0)) * 100.0;
}
} }
*r=vol.right; *r = vol.right;
*l=vol.left; *l = vol.left;
}
} }
void mixer_setvolume(mixer_t *mixer, float l, float r) void mixer_setvolume(mixer_t *mixer, float l, float r)
{ {
ao_control_vol_t vol; if (!mixer->ao) {
vol.right=r; vol.left=l; mixer->muted = 0;
if (mixer->ao) {
if(soft_vol ||
CONTROL_OK != ao_control(mixer->ao, AOCONTROL_SET_VOLUME, &vol)) {
if (!mixer->afilter)
return; return;
else { }
ao_control_vol_t vol;
vol.right = r;
vol.left = l;
if (soft_vol || CONTROL_OK != ao_control(mixer->ao, AOCONTROL_SET_VOLUME,
&vol)) {
// af_volume uses values in dB // af_volume uses values in dB
float db_vals[AF_NCH]; float db_vals[AF_NCH];
int i; int i;
db_vals[0] = (l / 100.0) * (soft_vol_max / 100.0); db_vals[0] = (l / 100.0) * (soft_vol_max / 100.0);
db_vals[1] = (r / 100.0) * (soft_vol_max / 100.0); db_vals[1] = (r / 100.0) * (soft_vol_max / 100.0);
for (i = 2; i < AF_NCH; i++) { for (i = 2; i < AF_NCH; i++)
db_vals[i] = ((l + r) / 100.0) * (soft_vol_max / 100.0) / 2.0; db_vals[i] = ((l + r) / 100.0) * (soft_vol_max / 100.0) / 2.0;
} af_to_dB(AF_NCH, db_vals, db_vals, 20.0);
af_to_dB (AF_NCH, db_vals, db_vals, 20.0);
if (!af_control_any_rev(mixer->afilter, if (!af_control_any_rev(mixer->afilter,
AF_CONTROL_VOLUME_LEVEL | AF_CONTROL_SET, db_vals)) { AF_CONTROL_VOLUME_LEVEL | AF_CONTROL_SET, db_vals)) {
mp_tmsg(MSGT_GLOBAL, MSGL_INFO, "[Mixer] No hardware mixing, inserting volume filter.\n"); mp_tmsg(MSGT_GLOBAL, MSGL_INFO,
if (af_add(mixer->afilter, "volume")) { "[Mixer] No hardware mixing, inserting volume filter.\n");
if (!af_control_any_rev(mixer->afilter, if (af_add(mixer->afilter, "volume")) {
AF_CONTROL_VOLUME_LEVEL | AF_CONTROL_SET, db_vals)) { if (!af_control_any_rev(mixer->afilter,
mp_tmsg(MSGT_GLOBAL, MSGL_ERR, "[Mixer] No volume control available.\n"); AF_CONTROL_VOLUME_LEVEL|AF_CONTROL_SET, db_vals)) {
return; mp_tmsg(MSGT_GLOBAL, MSGL_ERR,
"[Mixer] No volume control available.\n");
return;
}
} }
} }
}
}
} }
} mixer->muted = 0;
mixer->muted=0;
} }
void mixer_incvolume(mixer_t *mixer) void mixer_incvolume(mixer_t *mixer)
{ {
float mixer_l, mixer_r; float mixer_l, mixer_r;
mixer_getvolume(mixer, &mixer_l, &mixer_r); mixer_getvolume(mixer, &mixer_l, &mixer_r);
mixer_l += mixer->volstep; mixer_l += mixer->volstep;
if ( mixer_l > 100 ) mixer_l = 100; if (mixer_l > 100)
mixer_r += mixer->volstep; mixer_l = 100;
if ( mixer_r > 100 ) mixer_r = 100; mixer_r += mixer->volstep;
mixer_setvolume(mixer, mixer_l, mixer_r); if (mixer_r > 100)
mixer_r = 100;
mixer_setvolume(mixer, mixer_l, mixer_r);
} }
void mixer_decvolume(mixer_t *mixer) void mixer_decvolume(mixer_t *mixer)
{ {
float mixer_l, mixer_r; float mixer_l, mixer_r;
mixer_getvolume(mixer, &mixer_l, &mixer_r); mixer_getvolume(mixer, &mixer_l, &mixer_r);
mixer_l -= mixer->volstep; mixer_l -= mixer->volstep;
if ( mixer_l < 0 ) mixer_l = 0; if (mixer_l < 0)
mixer_r -= mixer->volstep; mixer_l = 0;
if ( mixer_r < 0 ) mixer_r = 0; mixer_r -= mixer->volstep;
mixer_setvolume(mixer, mixer_l, mixer_r); if (mixer_r < 0)
mixer_r = 0;
mixer_setvolume(mixer, mixer_l, mixer_r);
} }
void mixer_getbothvolume(mixer_t *mixer, float *b) void mixer_getbothvolume(mixer_t *mixer, float *b)
{ {
float mixer_l, mixer_r; float mixer_l, mixer_r;
mixer_getvolume(mixer, &mixer_l, &mixer_r); mixer_getvolume(mixer, &mixer_l, &mixer_r);
*b = ( mixer_l + mixer_r ) / 2; *b = (mixer_l + mixer_r) / 2;
} }
void mixer_mute(mixer_t *mixer) void mixer_mute(mixer_t *mixer)
{ {
if (mixer->muted) mixer_setvolume(mixer, mixer->last_l, mixer->last_r); if (mixer->muted) {
else mixer_setvolume(mixer, mixer->last_l, mixer->last_r);
{ } else {
mixer_getvolume(mixer, &mixer->last_l, &mixer->last_r); mixer_getvolume(mixer, &mixer->last_l, &mixer->last_r);
mixer_setvolume(mixer, 0, 0); mixer_setvolume(mixer, 0, 0);
mixer->muted=1; mixer->muted = 1;
} }
} }
void mixer_getbalance(mixer_t *mixer, float *val) void mixer_getbalance(mixer_t *mixer, float *val)
{ {
*val = 0.f; *val = 0.f;
if(!mixer->afilter) if (!mixer->afilter)
return; return;
af_control_any_rev(mixer->afilter, af_control_any_rev(mixer->afilter, AF_CONTROL_PAN_BALANCE | AF_CONTROL_GET,
AF_CONTROL_PAN_BALANCE | AF_CONTROL_GET, val); val);
} }
void mixer_setbalance(mixer_t *mixer, float val) void mixer_setbalance(mixer_t *mixer, float val)
{ {
float level[AF_NCH]; float level[AF_NCH];
int i; int i;
af_control_ext_t arg_ext = { .arg = level }; af_control_ext_t arg_ext = { .arg = level };
af_instance_t* af_pan_balance; af_instance_t *af_pan_balance;
if(!mixer->afilter) if (!mixer->afilter)
return; return;
if (af_control_any_rev(mixer->afilter,
AF_CONTROL_PAN_BALANCE | AF_CONTROL_SET, &val))
return;
if (!(af_pan_balance = af_add(mixer->afilter, "pan"))) { if (af_control_any_rev(mixer->afilter,
mp_tmsg(MSGT_GLOBAL, MSGL_ERR, "[Mixer] No balance control available.\n"); AF_CONTROL_PAN_BALANCE | AF_CONTROL_SET, &val))
return; return;
}
if (!(af_pan_balance = af_add(mixer->afilter, "pan"))) {
mp_tmsg(MSGT_GLOBAL, MSGL_ERR,
"[Mixer] No balance control available.\n");
return;
}
af_init(mixer->afilter);
/* make all other channels pass thru since by default pan blocks all */
memset(level, 0, sizeof(level));
for (i = 2; i < AF_NCH; i++) {
arg_ext.ch = i;
level[i] = 1.f;
af_pan_balance->control(af_pan_balance,
AF_CONTROL_PAN_LEVEL | AF_CONTROL_SET,
&arg_ext);
level[i] = 0.f;
}
af_init(mixer->afilter);
/* make all other channels pass thru since by default pan blocks all */
memset(level, 0, sizeof(level));
for (i = 2; i < AF_NCH; i++) {
arg_ext.ch = i;
level[i] = 1.f;
af_pan_balance->control(af_pan_balance, af_pan_balance->control(af_pan_balance,
AF_CONTROL_PAN_LEVEL | AF_CONTROL_SET, &arg_ext); AF_CONTROL_PAN_BALANCE | AF_CONTROL_SET, &val);
level[i] = 0.f;
}
af_pan_balance->control(af_pan_balance,
AF_CONTROL_PAN_BALANCE | AF_CONTROL_SET, &val);
} }

5
mixer.h
View File

@ -27,7 +27,7 @@ extern char * mixer_channel;
extern int soft_vol; extern int soft_vol;
extern float soft_vol_max; extern float soft_vol_max;
typedef struct mixer_s { typedef struct mixer {
struct ao *ao; struct ao *ao;
af_stream_t *afilter; af_stream_t *afilter;
int volstep; int volstep;
@ -44,7 +44,4 @@ void mixer_mute(mixer_t *mixer);
void mixer_getbalance(mixer_t *mixer, float *bal); void mixer_getbalance(mixer_t *mixer, float *bal);
void mixer_setbalance(mixer_t *mixer, float bal); void mixer_setbalance(mixer_t *mixer, float bal);
//void mixer_setbothvolume(int v);
#define mixer_setbothvolume(m, v) mixer_setvolume(m, v, v)
#endif /* MPLAYER_MIXER_H */ #endif /* MPLAYER_MIXER_H */