[Gnash-commit] gnash ChangeLog server/asobj/NetStreamFfmpeg.cp...

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Tomas Groth <tgc>       07/05/07 16:43:27

Modified files:
        .              : ChangeLog 
        server/asobj   : NetStreamFfmpeg.cpp NetStreamGst.cpp 

Log message:
                * server/asobj/NetStream{Ffmpeg,Gst}.cpp: After playback stops,
                  make it possible to restart video by seeking to 0 and setting
                  pause to false.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3119&r2=1.3120
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.33&r2=1.34

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3119
retrieving revision 1.3120
diff -u -b -r1.3119 -r1.3120
--- ChangeLog   7 May 2007 14:49:48 -0000       1.3119
+++ ChangeLog   7 May 2007 16:43:27 -0000       1.3120
@@ -1,3 +1,9 @@
+2007-05-07 Tomas Groth Christensen <address@hidden>
+
+       * server/asobj/NetStream{Ffmpeg,Gst}.cpp: After playback stops,
+         make it possible to restart video by seeking to 0 and setting
+         pause to false.
+
 2007-05-07 Martin Guy <address@hidden>
 
        * backend/sound_handler.h: Fix commentary about RAW and UNCOMPRESSED

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- server/asobj/NetStreamFfmpeg.cpp    6 May 2007 13:35:37 -0000       1.47
+++ server/asobj/NetStreamFfmpeg.cpp    7 May 2007 16:43:27 -0000       1.48
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStreamFfmpeg.cpp,v 1.47 2007/05/06 13:35:37 tgc Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.48 2007/05/07 16:43:27 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -95,6 +95,12 @@
        {
                m_pause = (mode == 0) ? true : false;
        }
+       if (!m_pause && !m_go) { 
+               setStatus(playStart);
+               m_go = true;
+               _decodeThread = new 
boost::thread(boost::bind(NetStreamFfmpeg::av_streamer, this)); 
+       }
+
 }
 
 void NetStreamFfmpeg::close()

Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- server/asobj/NetStreamGst.cpp       6 May 2007 20:03:55 -0000       1.33
+++ server/asobj/NetStreamGst.cpp       7 May 2007 16:43:27 -0000       1.34
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStreamGst.cpp,v 1.33 2007/05/06 20:03:55 tgc Exp $ */
+/* $Id: NetStreamGst.cpp,v 1.34 2007/05/07 16:43:27 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -113,8 +113,15 @@
                m_pause = (mode == 0) ? true : false;
        }
        if (pipeline) {
-               if (m_pause) gst_element_set_state (GST_ELEMENT (pipeline), 
GST_STATE_PAUSED);
-               else  gst_element_set_state (GST_ELEMENT (pipeline), 
GST_STATE_PLAYING);
+               if (m_pause) { 
+                       gst_element_set_state (GST_ELEMENT (pipeline), 
GST_STATE_PAUSED);
+               } else {
+                       if (!m_go) { 
+                               setStatus(playStart);
+                               m_go = true;
+                       }
+                       gst_element_set_state (GST_ELEMENT (pipeline), 
GST_STATE_PLAYING);
+               }
        }
 }
 
@@ -676,7 +683,6 @@
        // or stop if loading is complete
        if (m_pausePlayback) {
                m_pausePlayback = false;
-
                if (_netCon->loadCompleted()) {
                        setStatus(playStop);
                        gst_element_set_state (GST_ELEMENT (pipeline), 
GST_STATE_NULL);