/* for subtitles */
#include <lib/gui/esubtitle.h>
+#ifndef GST_SEEK_FLAG_SKIP
+#warning Compiling for legacy gstreamer, things will break
+#define GST_SEEK_FLAG_SKIP 0
+#define GST_TAG_HOMEPAGE ""
+#endif
+
// eServiceFactoryMP3
eServiceFactoryMP3::eServiceFactoryMP3()
RESULT eServiceMP3::start()
{
- assert(m_state == stIdle);
+ ASSERT(m_state == stIdle);
m_state = stRunning;
if (m_gst_playbin)
RESULT eServiceMP3::stop()
{
- assert(m_state != stIdle);
+ ASSERT(m_state != stIdle);
if (m_state == stStopped)
return -1;
eDebug("eServiceMP3::stop %s", m_filename.c_str());
// iPausableService
RESULT eServiceMP3::pause()
{
- if (!m_gst_playbin)
+ if (!m_gst_playbin || m_state != stRunning)
return -1;
GstStateChangeReturn res = gst_element_set_state(m_gst_playbin, GST_STATE_PAUSED);
if (res == GST_STATE_CHANGE_ASYNC)
RESULT eServiceMP3::unpause()
{
- if (!m_gst_playbin)
+ m_subtitle_pages.clear();
+ if (!m_gst_playbin || m_state != stRunning)
return -1;
GstStateChangeReturn res;
RESULT eServiceMP3::seekTo(pts_t to)
{
+ m_subtitle_pages.clear();
+
if (!m_gst_playbin)
return -1;
int eServiceMP3::getInfo(int w)
{
- gchar *tag = 0;
+ const gchar *tag = 0;
switch (w)
{
std::string eServiceMP3::getInfoString(int w)
{
- if ( !m_stream_tags )
+ if ( !m_stream_tags && w < sUser && w > 26 )
return "";
- gchar *tag = 0;
+ const gchar *tag = 0;
switch (w)
{
case sTagTitle:
case sTagChannelMode:
tag = "channel-mode";
break;
-
case sUser+12:
return m_error_message;
default:
PyObject *eServiceMP3::getInfoObject(int w)
{
- gchar *tag = 0;
+ const gchar *tag = 0;
bool isBuffer = false;
switch (w)
{
eDebug("eServiceMP3::gst_message from %s: %s (without structure)", sourceName, GST_MESSAGE_TYPE_NAME(msg));
#endif
if ( GST_MESSAGE_TYPE (msg) == GST_MESSAGE_STATE_CHANGED )
- return;
+ {
+ // only the pipeline message
+ if(GST_MESSAGE_SRC(msg) != GST_OBJECT(m_gst_playbin))
+ return;
+
+ GstState old_state, new_state;
+ gst_message_parse_state_changed(msg, &old_state, &new_state, NULL);
+
+ if(old_state == new_state)
+ return;
+
+ eDebug("eServiceMP3::state transition %s -> %s", gst_element_state_get_name(old_state), gst_element_state_get_name(new_state));
+
+ GstStateChange transition = (GstStateChange)GST_STATE_TRANSITION(old_state, new_state);
+
+ switch(transition)
+ {
+ case GST_STATE_CHANGE_NULL_TO_READY:
+ {
+ }
+ break;
+ case GST_STATE_CHANGE_READY_TO_PAUSED:
+ {
+
+ } break;
+ case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
+ {
+
+ } break;
+ case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
+ {
+
+ } break;
+ case GST_STATE_CHANGE_PAUSED_TO_READY:
+ {
+
+ } break;
+ case GST_STATE_CHANGE_READY_TO_NULL:
+ {
+
+ } break;
+ }
+ }
+
switch (GST_MESSAGE_TYPE (msg))
{
case GST_MESSAGE_EOS:
GstTagList *tags, *result;
gst_message_parse_tag(msg, &tags);
- result = gst_tag_list_merge(m_stream_tags, tags, GST_TAG_MERGE_PREPEND);
+ result = gst_tag_list_merge(m_stream_tags, tags, GST_TAG_MERGE_REPLACE);
if (result)
{
if (m_stream_tags)
g_free (g_lang);
// g_free (g_type);
}
+ m_event((iPlayableService*)this, evUpdatedEventInfo);
}
case GST_MESSAGE_ELEMENT:
{
ePangoSubtitlePage page;
GstClockTime base_time;
pts_t running_pts;
- GstElement *appsink = gst_bin_get_by_name(GST_BIN(m_gst_playbin),"subtitle_sink");
+ GstElement *syncsink;
+ g_object_get (G_OBJECT (m_gst_playbin), "audio-sink", &syncsink, NULL);
GstClock *clock;
- clock = gst_element_get_clock (appsink);
- do
+ clock = gst_element_get_clock (syncsink);
+ while ( !m_subtitle_pages.empty() )
{
page = m_subtitle_pages.front();
- base_time = gst_element_get_base_time (appsink);
- running_pts = ( gst_clock_get_time (clock) - base_time ) / 11111L;
+ base_time = gst_element_get_base_time (syncsink);
+ running_pts = gst_clock_get_time (clock) / 11111L;
gint64 diff_ms = ( page.show_pts - running_pts ) / 90;
-// eDebug("eServiceMP3::pushSubtitles show_pts = %lld running_pts = %lld diff = %lld", page.show_pts, running_pts, diff_ms);
+// eDebug("eServiceMP3::pushSubtitles show_pts = %lld running_pts = %lld diff = %lld", page.show_pts, running_pts, diff_ms);
if ( diff_ms > 20 )
{
-// eDebug("m_subtitle_sync_timer->start(%lld,1)", diff_ms);
+// eDebug("m_subtitle_sync_timer->start(%lld,1)", diff_ms);
m_subtitle_sync_timer->start(diff_ms, 1);
break;
}
m_subtitle_widget->setPage(page);
m_subtitle_pages.pop_front();
}
- } while ( !m_subtitle_pages.empty() );
+ } ;
gst_object_unref (clock);
}
g_object_get (G_OBJECT (m_gst_playbin), "current-text", &text_pid, NULL);
eDebug ("eServiceMP3::switched to subtitle stream %i", text_pid);
+ m_subtitle_pages.clear();
return 0;
RESULT eServiceMP3::disableSubtitles(eWidget *parent)
{
eDebug("eServiceMP3::disableSubtitles");
+ m_subtitle_pages.clear();
delete m_subtitle_widget;
m_subtitle_widget = 0;
return 0;