X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/dc5b3144665e827fccf38fcab1c167e6dacdac7a..88d7390f3d29293d4f87b9f70833215378305255:/lib/service/servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index de4f84ee..f67ea96b 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -1843,13 +1843,23 @@ void eDVBServicePlay::cutlistToCuesheet()
 	m_cue->commitSpans();
 }
 
-RESULT eDVBServicePlay::enableSubtitles(eWidget *parent, int index)
+RESULT eDVBServicePlay::enableSubtitles(eWidget *parent, PyObject *entry)
 {
 	if (m_subtitle_widget)
 		disableSubtitles(parent);
 	
+	if (!m_teletext_parser)
+		return -1;
+	
+	if (!PyInt_Check(entry))
+		return -1;
+	
 	m_subtitle_widget = new eSubtitleWidget(parent);
 	m_subtitle_widget->resize(parent->size()); /* full size */
+	
+	int page = PyInt_AsLong(entry);
+	
+	m_teletext_parser->setPage(page);
 
 	return 0;
 }
@@ -1861,9 +1871,27 @@ RESULT eDVBServicePlay::disableSubtitles(eWidget *parent)
 	return 0;
 }
 
-RESULT eDVBServicePlay::getSubtitleList(PyList *list)
+PyObject *eDVBServicePlay::getSubtitleList()
 {
-	return -1;
+	if (!m_teletext_parser)
+	{
+		Py_INCREF(Py_None);
+		return Py_None;
+	}
+	
+	PyObject *l = PyList_New(0);
+	
+	for (std::set<int>::iterator i(m_teletext_parser->m_found_subtitle_pages.begin()); i != m_teletext_parser->m_found_subtitle_pages.end(); ++i)
+	{
+		PyObject *tuple = PyTuple_New(2);
+		char desc[20];
+		sprintf(desc, "Page %x", *i);
+		PyTuple_SetItem(tuple, 0, PyString_FromString(desc));
+		PyTuple_SetItem(tuple, 1, PyInt_FromLong(*i));
+		PyList_Append(l, tuple);
+	}
+	
+	return l;
 }
 
 void eDVBServicePlay::newSubtitlePage(const eDVBTeletextSubtitlePage &page)