[alsa-devel] [PATCH 2/2] ascenario: Reduce SND_SCN_* defines to the basics.

Stefan Schmidt stefan at datenfreihafen.org
Thu Oct 8 17:29:18 CEST 2009


From: Stefan Schmidt <stefan at slimlogic.co.uk>

Also fix two minor qhitespace issues while being at it.

Signed-off-by: Stefan Schmidt <stefan at slimlogic.co.uk>
---
 include/ascenario.h |   25 ++-----------------------
 1 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/include/ascenario.h b/include/ascenario.h
index 6119f49..bc1543a 100644
--- a/include/ascenario.h
+++ b/include/ascenario.h
@@ -48,7 +48,7 @@ extern "C" {
  *  See \ref ascenario page for more details.
  *  \{
  */
-     
+
 /**
  * Scenario IDs
  *
@@ -61,12 +61,8 @@ extern "C" {
 #define SND_SCN_PLAYBACK_HEADPHONES     "playback headphone"
 /** use headset for playback */
 #define SND_SCN_PLAYBACK_HEADSET        "playback headset"
-/** use bluetooth interface for playback */
-#define SND_SCN_PLAYBACK_BLUETOOTH      "playback bluetooth"
 /** use handset interface for playback */
 #define SND_SCN_PLAYBACK_HANDSET        "playback handset"
-/** use gsm interface for playback */
-#define SND_SCN_PLAYBACK_GSM            "playback gsm"
 /** use line interface for playback */
 #define SND_SCN_PLAYBACK_LINE           "playback line"
 
@@ -78,23 +74,6 @@ extern "C" {
 #define SND_SCN_CAPTURE_HEADSET         "capture headset"
 /** use handset input for capture */
 #define SND_SCN_CAPTURE_HANDSET         "capture handset"
-/** use bluetooth input for capture */
-#define SND_SCN_CAPTURE_BLUETOOTH       "capture bluetooth"
-/** use gsm input for capture */
-#define SND_SCN_CAPTURE_GSM             "capture gsm"
-
-/** phone call through gsm handset */
-#define SND_SCN_PHONECALL_GSM_HANDSET   "phonecall gsm handset"
-/** phone call through bluetooth handset */
-#define SND_SCN_PHONECALL_BT_HANDSET    "phonecall bt handset"
-/** phone call through ip handset */
-#define SND_SCN_PHONECALL_IP_HANDSET    "phonecall ip handset"
-/** phone call through gsm headset */
-#define SND_SCN_PHONECALL_GSM_HEADSET   "phonecall gsm headset"
-/** phone call through bluetooth headset */
-#define SND_SCN_PHONECALL_BT_HEADSET    "phonecall bt headset"
-/** phone call through ip headset */
-#define SND_SCN_PHONECALL_IP_HEADSET    "phonecall ip headset"
 
 /**
  * QOS
@@ -224,4 +203,4 @@ int snd_scenario_dump(snd_output_t *output, const char *card_name);
 }
 #endif
 
-#endif /* __ALSA_ASCENARIO_H */  
+#endif /* __ALSA_ASCENARIO_H */
-- 
1.6.4.3



More information about the Alsa-devel mailing list