[Mplayer-cvslog] CVS: main/libao2 ao_nas.c,1.10,1.11

[Tobias Diedrich CVS]

Update of /cvsroot/mplayer/main/libao2
In directory mail:/var/tmp.root/cvs-serv515

Modified Files:
	ao_nas.c 
Log Message:
Implement volume setting functionality,
original patch by Nguyen Kim <nguyenk at ie2.u-psud.fr>.
Note that volume changing never worked on my system with NAS, but
that seems to be a nasd problem which I did not try to track down yet...


Index: ao_nas.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_nas.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ao_nas.c	13 Oct 2002 22:00:15 -0000	1.10
+++ ao_nas.c	24 Nov 2002 23:13:15 -0000	1.11
@@ -333,8 +333,53 @@
 }
 
 // to set/get/query special features/parameters
-static int control(int cmd,int arg){
-	return -1;
+static int control(int cmd, int arg)
+{
+	AuDeviceAttributes *dattr;
+	AuFixedPoint fpgain;
+	AuStatus as;
+	int gain;
+	ao_control_vol_t *vol = (ao_control_vol_t *)arg;
+
+	dattr = AuGetDeviceAttributes(nas_data->aud, nas_data->dev, &as);
+	if (as != AuSuccess) {
+		nas_print_error(nas_data->aud,
+		                "control(): AuGetDeviceAttributes", as);
+		return CONTROL_ERROR;
+	}
+	gain = AuFixedPointRoundDown(AuDeviceGain(dattr));
+	// kn: 0 <= gain <= 100
+
+	switch (cmd) {
+	case AOCONTROL_GET_VOLUME:
+
+		vol->right = (float) gain;
+		vol->left = vol->right;
+
+		return CONTROL_OK;
+
+	case AOCONTROL_SET_VOLUME:
+		/*
+		 * kn: we should have vol->left == vol->right but i don't
+		 * know if something can change it outside of ao_nas
+		 * so i take the mean of both values.
+		 */
+		gain = (int) ((vol->left+vol->right)/2);
+
+		fpgain = AuFixedPointFromSum(gain, 0);
+		AuDeviceGain(dattr) = fpgain;
+		AuSetDeviceAttributes(nas_data->aud, nas_data->dev,
+		                      AuCompDeviceGainMask, dattr, &as);
+		if (as != AuSuccess) {
+			nas_print_error(nas_data->aud,
+			                "control(): AuSetDeviceAttributes", as);
+			return CONTROL_ERROR;
+		}
+		return CONTROL_OK;
+
+	default:
+		return CONTROL_UNKNOWN;
+	};
 }
 
 // open & setup audio device