--- command.c.~1~	2010-08-04 07:46:31.000000000 +0200
+++ command.c	2010-11-17 16:30:52.000000000 +0100
@@ -2655,25 +2655,6 @@
             exit_player_with_rc(EXIT_QUIT,
                                 (cmd->nargs > 0) ? cmd->args[0].v.i : 0);
 
+        case MP_CMD_SPEAKER_PHONES:
+	  audio_driver_list[0] = "alsa:device=hw=0.0";
+	  audio_delay = -0.1;
+	  goto audio_cont;
+        case MP_CMD_SPEAKER_TV:
+	  audio_driver_list[0] = "alsa:device=hw=1.7";
+	  audio_delay = 0;
+	  goto audio_cont;
+        case MP_CMD_SPEAKER_STEREO:
+	  audio_driver_list[0] = "alsa:device=hw=2.0";
+	  audio_delay = 0;
+
+	audio_cont:
+	  mpctx->delay = audio_delay;
+	  audio_driver_list[1] = NULL;
+	  uninit_player(INITIALIZED_AO | INITIALIZED_ACODEC);
+	  reinit_audio_chain();
+	  break;
+
         case MP_CMD_PLAY_TREE_STEP:{
                 int n = cmd->args[0].v.i == 0 ? 1 : cmd->args[0].v.i;
                 int force = cmd->args[1].v.i;
--- input/input.h.~1~	2010-06-29 14:39:47.000000000 +0200
+++ input/input.h	2010-11-17 15:50:57.000000000 +0100
@@ -157,10 +157,6 @@
   MP_CMD_AF_DEL,
   MP_CMD_AF_CLR,
 
+  MP_CMD_SPEAKER_PHONES,
+  MP_CMD_SPEAKER_TV,
+  MP_CMD_SPEAKER_STEREO,
+
 } mp_command_type;
 
 // The arg types
--- input/input.c.~1~	2010-06-29 14:39:47.000000000 +0200
+++ input/input.c	2010-11-17 16:20:55.000000000 +0100
@@ -82,9 +82,6 @@
   { MP_CMD_SPEED_MULT, "speed_mult", 1, { {MP_CMD_ARG_FLOAT,{0}}, {-1,{0}} } },
   { MP_CMD_SPEED_SET, "speed_set", 1, { {MP_CMD_ARG_FLOAT,{0}}, {-1,{0}} } },
   { MP_CMD_QUIT, "quit", 0, { {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
+  { MP_CMD_SPEAKER_PHONES, "speaker_phones", 0, { {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
+  { MP_CMD_SPEAKER_TV, "speaker_tv", 0, { {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
+  { MP_CMD_SPEAKER_STEREO, "speaker_stereo", 0, { {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
   { MP_CMD_STOP, "stop", 0, { {-1,{0}} } },
   { MP_CMD_PAUSE, "pause", 0, { {-1,{0}} } },
   { MP_CMD_FRAME_STEP, "frame_step", 0, { {-1,{0}} } },
@@ -385,9 +382,6 @@
   { { '}', 0 }, "speed_mult 2.0" },
   { { KEY_BACKSPACE, 0 }, "speed_set 1.0" },
   { { 'q', 0 }, "quit" },
+  { { KEY_F+6, 0 }, "speaker_phones" },
+  { { KEY_F+7, 0 }, "speaker_tv" },
+  { { KEY_F+8, 0 }, "speaker_stereo" },
   { { KEY_ESC, 0 }, "quit" },
   { { 'p', 0 }, "pause" },
   { { ' ', 0 }, "pause" },