[Gnash-commit] gnash ChangeLog server/asobj/NetStreamGst.cpp [gnash_0_8_3_branch]

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         gnash_0_8_3_branch
Changes by:     Sandro Santilli <strk>  08/05/14 07:22:00

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&only_with_tag=gnash_0_8_3_branch&r1=1.6573.2.7&r2=1.6573.2.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&only_with_tag=gnash_0_8_3_branch&r1=1.86&r2=1.86.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6573.2.7
retrieving revision 1.6573.2.8
diff -u -b -r1.6573.2.7 -r1.6573.2.8
--- ChangeLog   14 May 2008 05:40:56 -0000      1.6573.2.7
+++ ChangeLog   14 May 2008 07:21:55 -0000      1.6573.2.8
@@ -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-14 Benjamin Wolsey <address@hidden>
 
        * server/parser/movie_def_impl.h: log malformed SWF and return

Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.86
retrieving revision 1.86.2.1
diff -u -b -r1.86 -r1.86.2.1
--- server/asobj/NetStreamGst.cpp       7 May 2008 20:59:30 -0000       1.86
+++ server/asobj/NetStreamGst.cpp       14 May 2008 07:21:58 -0000      1.86.2.1
@@ -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);