aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAndreas Frisch <andreas.frisch@multimedia-labs.de>2008-10-09 12:32:25 +0000
committerAndreas Frisch <andreas.frisch@multimedia-labs.de>2008-10-09 12:32:25 +0000
commit7734162c4314751a6a2539e09e06b8c7528359d9 (patch)
treea7ed8fa3e41864ba4ecd139ba9967b049aae446e /lib
parent8735bf9681ee930d09b9f7a0a19024ca29ad4e4e (diff)
downloadenigma2-7734162c4314751a6a2539e09e06b8c7528359d9.tar.gz
enigma2-7734162c4314751a6a2539e09e06b8c7528359d9.zip
implement parsing of srt subtitles with 8859-15 encoding
Diffstat (limited to 'lib')
-rw-r--r--lib/service/servicedvb.h2
-rw-r--r--lib/service/servicemp3.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 0bd12bd8..bae0c6e5 100644
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -81,7 +81,7 @@ public:
PyObject *getAll(bool original); // a sum of getFrontendData/Status/TransponderData
};
-class eSubtitleWidget;
+class eSubtitleWidget;
class eDVBServicePlay: public eDVBServiceBase,
public iPlayableService, public iPauseableService,
diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index 5181ce6c..76495826 100644
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -378,6 +378,7 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
g_object_set (G_OBJECT(switch_subtitles), "select-all", TRUE, NULL);
g_object_set (G_OBJECT(sink), "signal-handoffs", TRUE, NULL);
g_object_set (G_OBJECT(sink), "sync", TRUE, NULL);
+ g_object_set (G_OBJECT(parser), "subtitle-encoding", "ISO-8859-15", NULL);
g_signal_connect(sink, "handoff", G_CALLBACK(gstCBsubtitleAvail), this);
subtitleStream subs;
subs.language_code = std::string(".srt file");