3 files changed, 16 insertions, 4 deletions
diff --git a/TODO.txt b/TODO.txt
index 8db24e4..61671d5 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,2 +1,7 @@
-Can autodetect color key.
-ffodivxvdpau not always supported.
+mplayer:
+	Can autodetect color key.
+	ffodivxvdpau not always supported.
+
+Feature requests:
+	resume
+	service interface to play files
diff --git a/player.c b/player.c
index 4ec0f4d..7df9724 100644
--- a/player.c
+++ b/player.c
@@ -289,7 +289,13 @@ static void PlayerExec(const char *filename)
     args[10] = "-nograbpointer";
     args[11] = "-noconsolecontrols";
     args[12] = "-fixed-vo";
-    argn = 13;
+    args[13] = "-sid";			// subtitle selection
+    args[14] = "0";
+    args[15] = "-slang";
+    args[16] = "de,en";			// FIXME: use VDR config
+    args[17] = "-alang";
+    args[18] = "de,en";			// FIXME: use VDR config
+    argn = 19;
     if (ConfigMplayerDevice) {		// dvd-device
 	args[argn++] = "-dvd-device";
 	args[argn++] = ConfigMplayerDevice;
@@ -854,7 +860,7 @@ int ProcessArgs(int argc, char *const argv[])
     }
 
     for (;;) {
-	switch (getopt(argc, argv, "-%:/:b:d:fg:k:m:M:osv:")) {
+	switch (getopt(argc, argv, "-%:/:a:b:d:fg:k:m:M:osv:")) {
 	    case '%':			// dvd-device
 		ConfigMplayerDevice = optarg;
 		continue;
diff --git a/video.c b/video.c
index 73f819d..583ae8b 100644
--- a/video.c
+++ b/video.c
@@ -563,6 +563,7 @@ void VideoPollEvents(int timeout)
 	xcb_flush(Connection);
 
 	// wait for events or timeout
+	// FIXME: this can poll forever
 	if ((n = poll(fds, 1, delay)) <= 0) {
 	    // error or timeout
 	    if (n) {			// error