diff options
| author | Johannes Stezenbach <js@linuxtv.org> | 2005-03-13 00:14:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-13 00:14:35 -0800 |
| commit | ea8924f74c7d3dd4e2da744ba4c51f0826a9a337 (patch) | |
| tree | cc30e2d7f392c624cc6ec28993ee99ac6d63a366 /include/linux/dvb/audio.h | |
| parent | 83c6737c8f5a6304cef0a85e3a428f7566c22220 (diff) | |
[PATCH] DVB whitespace cleanup
This is the DVB whitespace cleanup patch (the big one ;-).
I checked the whitespace-onlyness:
linux-2.6.11-bk9$ find drivers/media/common drivers/media/dvb -name "*.o" | xargs size >/tmp/1
linux-2.6.11-bk9$ cd -
linux-2.6.11-bk9.patched
linux-2.6.11-bk9.patched$ find drivers/media/common drivers/media/dvb -name "*.o" | xargs size >/tmp/2
linux-2.6.11-bk9.patched$ less /tmp/1
linux-2.6.11-bk9.patched$ less /tmp/2
linux-2.6.11-bk9.patched$ diff -us /tmp/1 /tmp/2
Files /tmp/1 and /tmp/2 are identical
DVB whitespace cleanups:
o sync kernel and linuxtv.org CVS wrt whitespace
o repair indentation damage
o remove whitespace at eol
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/dvb/audio.h')
| -rw-r--r-- | include/linux/dvb/audio.h | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/include/linux/dvb/audio.h b/include/linux/dvb/audio.h index 58956c3bba52..cc314443f1c4 100644 --- a/include/linux/dvb/audio.h +++ b/include/linux/dvb/audio.h @@ -1,9 +1,9 @@ -/* +/* * audio.h * * Copyright (C) 2000 Ralph Metzler <ralph@convergence.de> * & Marcus Metzler <marcus@convergence.de> - for convergence integrated media GmbH + * for convergence integrated media GmbH * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Lesser Public License @@ -32,35 +32,35 @@ typedef enum { - AUDIO_SOURCE_DEMUX, /* Select the demux as the main source */ - AUDIO_SOURCE_MEMORY /* Select internal memory as the main source */ + AUDIO_SOURCE_DEMUX, /* Select the demux as the main source */ + AUDIO_SOURCE_MEMORY /* Select internal memory as the main source */ } audio_stream_source_t; -typedef enum { - AUDIO_STOPPED, /* Device is stopped */ - AUDIO_PLAYING, /* Device is currently playing */ - AUDIO_PAUSED /* Device is paused */ +typedef enum { + AUDIO_STOPPED, /* Device is stopped */ + AUDIO_PLAYING, /* Device is currently playing */ + AUDIO_PAUSED /* Device is paused */ } audio_play_state_t; typedef enum { AUDIO_STEREO, - AUDIO_MONO_LEFT, - AUDIO_MONO_RIGHT + AUDIO_MONO_LEFT, + AUDIO_MONO_RIGHT } audio_channel_select_t; -typedef struct audio_mixer { +typedef struct audio_mixer { unsigned int volume_left; unsigned int volume_right; // what else do we need? bass, pass-through, ... } audio_mixer_t; -typedef struct audio_status { +typedef struct audio_status { int AV_sync_state; /* sync audio and video? */ - int mute_state; /* audio is muted */ + int mute_state; /* audio is muted */ audio_play_state_t play_state; /* current playback state */ audio_stream_source_t stream_source; /* current stream source */ audio_channel_select_t channel_select; /* currently selected channel */ @@ -88,7 +88,7 @@ typedef uint16_t audio_attributes_t; /* 7- 6 Quantization / DRC (mpeg audio: 1=DRC exists)(lpcm: 0=16bit, */ /* 5- 4 Sample frequency fs (0=48kHz, 1=96kHz) */ /* 2- 0 number of audio channels (n+1 channels) */ - + /* for GET_CAPABILITIES and SET_FORMAT, the latter should only set one bit */ #define AUDIO_CAP_DTS 1 @@ -101,7 +101,7 @@ typedef uint16_t audio_attributes_t; #define AUDIO_CAP_SDDS 128 #define AUDIO_CAP_AC3 256 -#define AUDIO_STOP _IO('o', 1) +#define AUDIO_STOP _IO('o', 1) #define AUDIO_PLAY _IO('o', 2) #define AUDIO_PAUSE _IO('o', 3) #define AUDIO_CONTINUE _IO('o', 4) @@ -122,4 +122,3 @@ typedef uint16_t audio_attributes_t; #define AUDIO_SET_KARAOKE _IOW('o', 18, audio_karaoke_t) #endif /* _DVBAUDIO_H_ */ - |