diff options
author | McCabe Maxsted | 2009-02-20 18:04:44 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-02-20 18:04:44 -0700 |
commit | f36844960f4b03ca52006ae5608f0062f5a9f557 (patch) | |
tree | b48a03076713e20a7cfb413a9664d2051453fd0c | |
parent | Added STATUS_DEAD to LLMediaBase (diff) | |
download | meta-impy-f36844960f4b03ca52006ae5608f0062f5a9f557.zip meta-impy-f36844960f4b03ca52006ae5608f0062f5a9f557.tar.gz meta-impy-f36844960f4b03ca52006ae5608f0062f5a9f557.tar.bz2 meta-impy-f36844960f4b03ca52006ae5608f0062f5a9f557.tar.xz |
get_state shows name info
-rw-r--r-- | linden/indra/llmedia/llmediaimplgstreamer.cpp | 6 | ||||
-rw-r--r-- | linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp index 20a1fc3..ece3fb0 100644 --- a/linden/indra/llmedia/llmediaimplgstreamer.cpp +++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp | |||
@@ -600,7 +600,7 @@ bool LLMediaImplGStreamer::stop() | |||
600 | mState = GST_STATE_READY; | 600 | mState = GST_STATE_READY; |
601 | 601 | ||
602 | GstStateChangeReturn state_change = llgst_element_get_state(mPlaybin, NULL, NULL, GST_CLOCK_TIME_NONE); | 602 | GstStateChangeReturn state_change = llgst_element_get_state(mPlaybin, NULL, NULL, GST_CLOCK_TIME_NONE); |
603 | LL_DEBUGS("MediaImpl") << "get_state: " << state_change << LL_ENDL; | 603 | LL_DEBUGS("MediaImpl") << "get_state: " << llgst_element_state_change_return_get_name(state_change) << LL_ENDL; |
604 | 604 | ||
605 | return true; | 605 | return true; |
606 | } | 606 | } |
@@ -623,7 +623,7 @@ bool LLMediaImplGStreamer::play() | |||
623 | mState = GST_STATE_PLAYING;*/ | 623 | mState = GST_STATE_PLAYING;*/ |
624 | 624 | ||
625 | GstStateChangeReturn state_change = llgst_element_get_state(mPlaybin, NULL, NULL, GST_CLOCK_TIME_NONE); | 625 | GstStateChangeReturn state_change = llgst_element_get_state(mPlaybin, NULL, NULL, GST_CLOCK_TIME_NONE); |
626 | LL_DEBUGS("MediaImpl") << "get_state: " << state_change << LL_ENDL; | 626 | LL_DEBUGS("MediaImpl") << "get_state: " << llgst_element_state_change_return_get_name(state_change) << LL_ENDL; |
627 | 627 | ||
628 | // Check to make sure playing was successful. If not, stop. | 628 | // Check to make sure playing was successful. If not, stop. |
629 | if (state_change == GST_STATE_CHANGE_FAILURE) | 629 | if (state_change == GST_STATE_CHANGE_FAILURE) |
@@ -648,7 +648,7 @@ bool LLMediaImplGStreamer::pause() | |||
648 | mState = GST_STATE_PAUSED; | 648 | mState = GST_STATE_PAUSED; |
649 | 649 | ||
650 | GstStateChangeReturn state_change = llgst_element_get_state(mPlaybin, NULL, NULL, GST_CLOCK_TIME_NONE); | 650 | GstStateChangeReturn state_change = llgst_element_get_state(mPlaybin, NULL, NULL, GST_CLOCK_TIME_NONE); |
651 | LL_DEBUGS("MediaImpl") << "get_state: " << state_change << LL_ENDL; | 651 | LL_DEBUGS("MediaImpl") << "get_state: " << llgst_element_state_change_return_get_name(state_change) << LL_ENDL; |
652 | 652 | ||
653 | return true; | 653 | return true; |
654 | }; | 654 | }; |
diff --git a/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc b/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc index fcee823..0d0d764 100644 --- a/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc +++ b/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc | |||
@@ -38,6 +38,7 @@ LL_GST_SYM(true, gst_value_get_fraction_denominator, gint, const GValue *value); | |||
38 | LL_GST_SYM(true, gst_structure_get_name, G_CONST_RETURN gchar *, const GstStructure *structure); | 38 | LL_GST_SYM(true, gst_structure_get_name, G_CONST_RETURN gchar *, const GstStructure *structure); |
39 | LL_GST_SYM(true, gst_element_seek, bool, GstElement *, gdouble, GstFormat, GstSeekFlags, GstSeekType, gint64, GstSeekType, gint64); | 39 | LL_GST_SYM(true, gst_element_seek, bool, GstElement *, gdouble, GstFormat, GstSeekFlags, GstSeekType, gint64, GstSeekType, gint64); |
40 | LL_GST_SYM(true, gst_version, void, guint *major, guint *minor, guint *micro, guint *nano); | 40 | LL_GST_SYM(true, gst_version, void, guint *major, guint *minor, guint *micro, guint *nano); |
41 | LL_GST_SYM(true, gst_element_state_change_return_get_name, const gchar *, GstStateChangeReturn state_ret); | ||
41 | 42 | ||
42 | // optional symbols to grab | 43 | // optional symbols to grab |
43 | LL_GST_SYM(false, gst_segtrap_set_enabled, void, gboolean enabled); | 44 | LL_GST_SYM(false, gst_segtrap_set_enabled, void, gboolean enabled); |