aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmedia/llmediaimplgstreamer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llmedia/llmediaimplgstreamer.cpp')
-rw-r--r--linden/indra/llmedia/llmediaimplgstreamer.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 532ec00..2ba33a1 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -713,13 +713,18 @@ bool LLMediaImplGStreamer::play()
713 if (!mPlaybin || mState == GST_STATE_NULL) 713 if (!mPlaybin || mState == GST_STATE_NULL)
714 return true; 714 return true;
715 715
716 startPlay();
717
718 return true;
719}
720
721void LLMediaImplGStreamer::startPlay()
722{
716 GstElement *pipeline = (GstElement *)gst_object_ref(GST_OBJECT(mPlaybin)); 723 GstElement *pipeline = (GstElement *)gst_object_ref(GST_OBJECT(mPlaybin));
717 gst_object_unref(pipeline); 724 gst_object_unref(pipeline);
718 725
719 gst_element_set_state(pipeline, GST_STATE_PLAYING); 726 gst_element_set_state(pipeline, GST_STATE_PLAYING);
720 mState = GST_STATE_PLAYING; 727 mState = GST_STATE_PLAYING;
721 /*gst_element_set_state(mPlaybin, GST_STATE_PLAYING);
722 mState = GST_STATE_PLAYING;*/
723 728
724 GstStateChangeReturn state_change = gst_element_get_state(mPlaybin, NULL, NULL, GST_CLOCK_TIME_NONE); 729 GstStateChangeReturn state_change = gst_element_get_state(mPlaybin, NULL, NULL, GST_CLOCK_TIME_NONE);
725 LL_DEBUGS("MediaImpl") << "get_state: " << gst_element_state_change_return_get_name(state_change) << LL_ENDL; 730 LL_DEBUGS("MediaImpl") << "get_state: " << gst_element_state_change_return_get_name(state_change) << LL_ENDL;
@@ -730,8 +735,6 @@ bool LLMediaImplGStreamer::play()
730 setStatus(LLMediaBase::STATUS_STOPPED); 735 setStatus(LLMediaBase::STATUS_STOPPED);
731 stop(); 736 stop();
732 } 737 }
733
734 return true;
735} 738}
736 739
737/////////////////////////////////////////////////////////////////////////////// 740///////////////////////////////////////////////////////////////////////////////