From ca7333ab52acb1fd4cb19dc2b2817507a8ae9d75 Mon Sep 17 00:00:00 2001
From: Fraxinas <andreas.frisch@multimedia-labs.de>
Date: Fri, 28 Jan 2011 10:59:51 +0100
Subject: [PATCH] DVDPlayer subtitle stream selection through enigma2
 AudioSelection dialog (#441)

---
 .../Extensions/DVDPlayer/src/servicedvd.cpp   | 34 ++++++++++++++-----
 lib/python/Screens/AudioSelection.py          |  4 +--
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
index da9c0bb7..b960ed67 100644
--- a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
+++ b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
@@ -407,7 +407,6 @@ int eServiceDVD::getNumberOfTracks()
 {
 	int i = 0;
 	ddvd_get_audio_count(m_ddvdconfig, &i);
-	eDebug("getNumberOfTracks returns %i", i);
 	return i;
 }
 
@@ -416,14 +415,12 @@ int eServiceDVD::getCurrentTrack()
 	int audio_id,audio_type;
 	uint16_t audio_lang;
 	ddvd_get_last_audio(m_ddvdconfig, &audio_id, &audio_lang, &audio_type);
-	eDebug("getCurrentTrack returns %i", audio_id);
 	return audio_id;
 }
 
 RESULT eServiceDVD::selectTrack(unsigned int i)
 {
 	ddvd_set_audio(m_ddvdconfig, i);
-	eDebug("selectTrack %i", i);
 	return 0;
 }
 
@@ -681,14 +678,32 @@ PyObject *eServiceDVD::getInfoObject(int w)
 	Py_RETURN_NONE;
 }
 
-RESULT eServiceDVD::enableSubtitles(eWidget *parent, SWIG_PYOBJECT(ePyObject) /*entry*/)
+RESULT eServiceDVD::enableSubtitles(eWidget *parent, ePyObject tuple)
 {
 	delete m_subtitle_widget;
+	eSize size = eSize(720, 576);
 
 	m_subtitle_widget = new eSubtitleWidget(parent);
 	m_subtitle_widget->resize(parent->size());
-
-	eSize size = eSize(720, 576);
+	
+	int pid = -1;
+
+	if ( tuple != Py_None )
+	{		
+		ePyObject entry;
+		int tuplesize = PyTuple_Size(tuple);
+		if (!PyTuple_Check(tuple))
+			goto error_out;
+		if (tuplesize < 1)
+			goto error_out;
+		entry = PyTuple_GET_ITEM(tuple, 1);
+		if (!PyInt_Check(entry))
+			goto error_out;
+		pid = PyInt_AsLong(entry)-1;
+
+		ddvd_set_spu(m_ddvdconfig, pid);
+	}
+	eDebug("eServiceDVD::enableSubtitles %i", pid);
 
 	if (!m_pixmap)
 	{
@@ -706,6 +721,9 @@ RESULT eServiceDVD::enableSubtitles(eWidget *parent, SWIG_PYOBJECT(ePyObject) /*
 	m_subtitle_widget->show();
 
 	return 0;
+
+error_out:
+	return -1;
 }
 
 RESULT eServiceDVD::disableSubtitles(eWidget */*parent*/)
@@ -717,8 +735,6 @@ RESULT eServiceDVD::disableSubtitles(eWidget */*parent*/)
 
 PyObject *eServiceDVD::getSubtitleList()
 {
-	eDebug("eServiceMP3::getSubtitleList");
-
 	ePyObject l = PyList_New(0);
 	unsigned int spu_count = 0;
 	ddvd_get_spu_count(m_ddvdconfig, &spu_count);
@@ -731,7 +747,7 @@ PyObject *eServiceDVD::getSubtitleList()
 
 		ePyObject tuple = PyTuple_New(5);
 		PyTuple_SetItem(tuple, 0, PyInt_FromLong(2));
-		PyTuple_SetItem(tuple, 1, PyInt_FromLong(0));
+		PyTuple_SetItem(tuple, 1, PyInt_FromLong(spu_id+1));
 		PyTuple_SetItem(tuple, 2, PyInt_FromLong(3));
 		PyTuple_SetItem(tuple, 3, PyInt_FromLong(0));
 		PyTuple_SetItem(tuple, 4, PyString_FromString(spu_string));
diff --git a/lib/python/Screens/AudioSelection.py b/lib/python/Screens/AudioSelection.py
index 576fd381..b3b82b46 100644
--- a/lib/python/Screens/AudioSelection.py
+++ b/lib/python/Screens/AudioSelection.py
@@ -84,7 +84,7 @@ class AudioSelection(Screen, ConfigListScreen):
 					conflist.append(getConfigListEntry(_("Channel"), self.settings.channelmode))
 					self["key_green"].setBoolean(True)
 				else:
-					conflist.append(getConfigListEntry("", ConfigNothing()))
+					conflist.append(('',))
 					self["key_green"].setBoolean(False)
 				selectedAudio = self.audioTracks.getCurrentTrack()
 				for x in range(n):
@@ -141,7 +141,7 @@ class AudioSelection(Screen, ConfigListScreen):
 					language = _("<unknown>")
 					selected = ""
 
-					if sel and x[:4] == sel[:4]:
+					if sel and x == sel:
 						selected = _("Running")
 						selectedidx = idx
 					
-- 
2.30.2