[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/asobj/NetStreamGst.cpp
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog server/asobj/NetStreamGst.cpp |
Date: |
Wed, 14 May 2008 07:18:16 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 08/05/14 07:18:13
Modified files:
. : ChangeLog
server/asobj : NetStreamGst.cpp
Log message:
* server/asobj/NetStreamGst.cpp (time,bytesLoaded,bytesTotal): check
existance of the elements before querying them. Fixes some
gst-CRITICAL errors.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6596&r2=1.6597
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.86&r2=1.87
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6596
retrieving revision 1.6597
diff -u -b -r1.6596 -r1.6597
--- ChangeLog 14 May 2008 00:01:34 -0000 1.6596
+++ ChangeLog 14 May 2008 07:18:06 -0000 1.6597
@@ -1,3 +1,9 @@
+2008-05-14 Sandro Santilli <address@hidden>
+
+ * server/asobj/NetStreamGst.cpp (time,bytesLoaded,bytesTotal): check
+ existance of the elements before querying them. Fixes some
+ gst-CRITICAL errors.
+
2008-05-13 Bastiaan Jacques <address@hidden>
* libmedia/ffmpeg/VideoDecoderFfmpeg.cpp: Don't neglect to return the
Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- server/asobj/NetStreamGst.cpp 7 May 2008 20:59:30 -0000 1.86
+++ server/asobj/NetStreamGst.cpp 14 May 2008 07:18:12 -0000 1.87
@@ -320,6 +320,8 @@
boost::int32_t
NetStreamGst::time()
{
+ if ( ! _pipeline ) return 0;
+
GstFormat fmt = GST_FORMAT_TIME;
gint64 pos = 0;
@@ -390,6 +392,8 @@
NetStreamGst::bytesLoaded()
{
+ if ( ! _downloader ) return 0;
+
gint64 pos = 0;
GstFormat format = GST_FORMAT_BYTES;
gst_element_query_position(_downloader, &format, &pos);
@@ -412,7 +416,10 @@
long
NetStreamGst::bytesTotal()
{
+ if ( ! _downloader ) return _duration;
+
gint64 duration = 0;
+
GstFormat format = GST_FORMAT_BYTES;
gst_element_query_duration (_downloader, &format, &duration);
- [Gnash-commit] gnash ChangeLog server/asobj/NetStreamGst.cpp,
Sandro Santilli <=