aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJacek Antonelli2009-04-18 02:56:52 -0500
committerJacek Antonelli2009-04-18 03:41:52 -0500
commita84bece4c4ba0a70d469be21cfbfe230f504f801 (patch)
tree2bad2f28c99017aa2985b21e404971e97fb1f42d
parentLLMediaImplGStreamer::play() is no-op if already playing. (diff)
downloadmeta-impy-a84bece4c4ba0a70d469be21cfbfe230f504f801.zip
meta-impy-a84bece4c4ba0a70d469be21cfbfe230f504f801.tar.gz
meta-impy-a84bece4c4ba0a70d469be21cfbfe230f504f801.tar.bz2
meta-impy-a84bece4c4ba0a70d469be21cfbfe230f504f801.tar.xz
Removed redundant play() from LLMediaImplGStreamer::navigateTo().
-rw-r--r--ChangeLog.txt4
-rw-r--r--linden/indra/llmedia/llmediaimplgstreamer.cpp3
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index f9ecbc3..fe0593c 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,6 +1,10 @@
12009-04-18 Jacek Antonelli <jacek.antonelli@gmail.com> 12009-04-18 Jacek Antonelli <jacek.antonelli@gmail.com>
2 2
3 * linden/indra/llmedia/llmediaimplgstreamer.cpp: 3 * linden/indra/llmedia/llmediaimplgstreamer.cpp:
4 Removed redundant play() from LLMediaImplGStreamer::navigateTo().
5
6
7 * linden/indra/llmedia/llmediaimplgstreamer.cpp:
4 LLMediaImplGStreamer::play() is no-op if already playing. 8 LLMediaImplGStreamer::play() is no-op if already playing.
5 9
6 10
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 3fd6d6e..885ba7f 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -591,9 +591,6 @@ bool LLMediaImplGStreamer::navigateTo (const std::string urlIn)
591 591
592 mState = GST_STATE_READY; 592 mState = GST_STATE_READY;
593 593
594 // navigateTo implicitly plays, too.
595 play();
596
597 return true; 594 return true;
598} 595}
599 596