[Gnash-commit] gnash ChangeLog server/parser/video_stream_def.... [release_0_8_2_rc1]

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release_0_8_2_rc1
Changes by:     Sandro Santilli <strk>  08/02/28 17:14:27

Modified files:
        .              : ChangeLog 
        server/parser  : video_stream_def.cpp video_stream_def.h 

Log message:
        fix build and runtime with --disable-media.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_2_rc1&r1=1.5711.2.36&r2=1.5711.2.37
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/video_stream_def.cpp?cvsroot=gnash&only_with_tag=release_0_8_2_rc1&r1=1.39.2.2&r2=1.39.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/video_stream_def.h?cvsroot=gnash&only_with_tag=release_0_8_2_rc1&r1=1.22.2.2&r2=1.22.2.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5711.2.36
retrieving revision 1.5711.2.37
diff -u -b -r1.5711.2.36 -r1.5711.2.37
--- ChangeLog   28 Feb 2008 16:26:08 -0000      1.5711.2.36
+++ ChangeLog   28 Feb 2008 17:14:26 -0000      1.5711.2.37
@@ -1,5 +1,10 @@
 2008-02-28 Sandro Santilli <address@hidden>
 
+       * server/parser/video_stream_def.{cpp,h}: fix build and runtime
+         with --disable-media.
+
+2008-02-28 Sandro Santilli <address@hidden>
+
        * doc/C/usermanual/installation/feature_configuration.xml: update the
          default media configuration.
        * configure.ac: pretend --enable-media=gst was given by default, so we

Index: server/parser/video_stream_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/video_stream_def.cpp,v
retrieving revision 1.39.2.2
retrieving revision 1.39.2.3
diff -u -b -r1.39.2.2 -r1.39.2.3
--- server/parser/video_stream_def.cpp  27 Feb 2008 20:55:03 -0000      1.39.2.2
+++ server/parser/video_stream_def.cpp  28 Feb 2008 17:14:27 -0000      1.39.2.3
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: video_stream_def.cpp,v 1.39.2.2 2008/02/27 20:55:03 bjacques Exp $
+// $Id: video_stream_def.cpp,v 1.39.2.3 2008/02/28 17:14:27 strk Exp $
 
 #include "video_stream_def.h"
 #include "video_stream_instance.h"
@@ -89,12 +89,10 @@
        }
 
 #ifdef SOUND_GST
-# define VIDEO_DECODER_NAME VideoDecoderGst
+       _decoder.reset( new media::VideoDecoderGst(m_codec_id, _width, _height) 
);
 #elif defined(USE_FFMPEG)
-# define VIDEO_DECODER_NAME VideoDecoderFfmpeg
+       _decoder.reset( new media::VideoDecoderFfmpeg(m_codec_id, _width, 
_height) );
 #endif
-       _decoder.reset( new media::VIDEO_DECODER_NAME(m_codec_id, _width, 
_height) );
-#undef VIDEO_DECODER_NAME
 }
 
 void
@@ -103,6 +101,7 @@
        // Character ID has been read already, and was loaded in the constructor
 
        assert(tag == SWF::VIDEOFRAME);
+       if ( ! _decoder.get() ) return; // --enable-media=none - TODO: create a 
NullVideoDecoder ?
        assert ( _decoder.get() ); // not allowed to be called for a 
dynamically-created video_stream_def
 
        in->ensureBytes(2);

Index: server/parser/video_stream_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/video_stream_def.h,v
retrieving revision 1.22.2.2
retrieving revision 1.22.2.3
diff -u -b -r1.22.2.2 -r1.22.2.3
--- server/parser/video_stream_def.h    27 Feb 2008 20:55:03 -0000      1.22.2.2
+++ server/parser/video_stream_def.h    28 Feb 2008 17:14:27 -0000      1.22.2.3
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: video_stream_def.h,v 1.22.2.2 2008/02/27 20:55:03 bjacques Exp $
+// $Id: video_stream_def.h,v 1.22.2.3 2008/02/28 17:14:27 strk Exp $
 
 #ifndef GNASH_VIDEO_STREAM_DEF_H
 #define GNASH_VIDEO_STREAM_DEF_H
@@ -33,12 +33,6 @@
 #include "ControlTag.h"
 #include "VideoDecoder.h"
 
-#ifdef SOUND_GST
-# include "VideoDecoderGst.h"
-#elif defined(USE_FFMPEG)
-# include "VideoDecoderFfmpeg.h"
-#endif
-
 #include "image.h"
 
 #include <boost/shared_array.hpp>
@@ -182,11 +176,7 @@
        boost::uint32_t _height;
 
        /// The decoder used to decode the video frames
-#ifdef SOUND_GST
-       boost::scoped_ptr<media::VideoDecoderGst> _decoder;
-#elif defined(USE_FFMPEG)
-       boost::scoped_ptr<media::VideoDecoderFfmpeg> _decoder;
-#endif
+       boost::scoped_ptr<media::VideoDecoder> _decoder;
 };
 
 }      // end namespace gnash