summaryrefslogtreecommitdiff
path: root/linux/include/media/audiochip.h
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2006-03-19 01:31:00 +0100
committerHans Verkuil <hverkuil@xs4all.nl>2006-03-19 01:31:00 +0100
commit4d93017b78b84f0e38f348ba71a4e0206d753c09 (patch)
tree0c75f25c982935f452c34b17be52b345c5b4f482 /linux/include/media/audiochip.h
parent2d0abb67a8d568f7bfd5ae1814cf1f34757237da (diff)
downloadmediapointer-dvb-s2-4d93017b78b84f0e38f348ba71a4e0206d753c09.tar.gz
mediapointer-dvb-s2-4d93017b78b84f0e38f348ba71a4e0206d753c09.tar.bz2
Cleanup audio input handling
From: Hans Verkuil <hverkuil@xs4all.nl> Cleanup audio input handling in bttv and tvaudio: - inputs were specified that were never used - mute was handled as a special input which led to confusing code - confusing naming made it difficult to see if the setting was for i2c or gpio. The old audiochip.h input names moved to tvaudio.h. Currently this is used both by tvaudio and msp3400 until the msp3400 implements the new msp3400-specific inputs. Detect in bttv the tvaudio and msp3400 i2c clients and use these client pointers to set the inputs directly instead of broadcasting the command. Removed AUDC_SET_INPUT. Now replaced by VIDIOC_S_AUDIO. This will be replaced again later by the new ROUTING commands. Removed VIDIOC_G_AUDIO implementations in i2c drivers: this command is a user level command and not to be used internally. It wasn't called at all anyway. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/include/media/audiochip.h')
-rw-r--r--linux/include/media/audiochip.h14
1 files changed, 0 insertions, 14 deletions
diff --git a/linux/include/media/audiochip.h b/linux/include/media/audiochip.h
index 4589fd95f..41db54b17 100644
--- a/linux/include/media/audiochip.h
+++ b/linux/include/media/audiochip.h
@@ -22,18 +22,4 @@ enum audiochip {
AUDIO_CHIP_MSP34XX
};
-/* ---------------------------------------------------------------------- */
-
-/* audio inputs */
-#define AUDIO_TUNER 0x00
-#define AUDIO_RADIO 0x01
-#define AUDIO_EXTERN 0x02
-#define AUDIO_INTERN 0x03
-#define AUDIO_OFF 0x04
-#define AUDIO_ON 0x05
-#define AUDIO_EXTERN_1 AUDIO_EXTERN
-#define AUDIO_EXTERN_2 0x06
-#define AUDIO_MUTE 0x80
-#define AUDIO_UNMUTE 0x81
-
#endif /* AUDIOCHIP_H */