[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/video_stream_instance.h ...
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog server/video_stream_instance.h ... |
Date: |
Fri, 07 Sep 2007 22:24:42 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/09/07 22:24:41
Modified files:
. : ChangeLog
server : video_stream_instance.h
server/parser : video_stream_def.cpp
Log message:
* server/video_stream_instance.h: keep definition by
intrusive_ptr (just for consistency with other
character instances)
* server/parser/video_stream_def.cpp (get_frame_data):
always set output parameters to 0 if requested frame
number is not available.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4252&r2=1.4253
http://cvs.savannah.gnu.org/viewcvs/gnash/server/video_stream_instance.h?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/video_stream_def.cpp?cvsroot=gnash&r1=1.12&r2=1.13
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4252
retrieving revision 1.4253
diff -u -b -r1.4252 -r1.4253
--- ChangeLog 7 Sep 2007 14:49:10 -0000 1.4252
+++ ChangeLog 7 Sep 2007 22:24:40 -0000 1.4253
@@ -1,5 +1,14 @@
2007-09-07 Sandro Santilli <address@hidden>
+ * server/video_stream_instance.h: keep definition by
+ intrusive_ptr (just for consistency with other
+ character instances)
+ * server/parser/video_stream_def.cpp (get_frame_data):
+ always set output parameters to 0 if requested frame
+ number is not available.
+
+2007-09-07 Sandro Santilli <address@hidden>
+
* server/dlist.{cpp,h}: change signature of .reset() to
take a sprite_instance for calling set_invalidated() when
needed.
Index: server/video_stream_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/video_stream_instance.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/video_stream_instance.h 9 Jul 2007 13:33:30 -0000 1.18
+++ server/video_stream_instance.h 7 Sep 2007 22:24:41 -0000 1.19
@@ -16,7 +16,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: video_stream_instance.h,v 1.18 2007/07/09 13:33:30 strk Exp $
+// $Id: video_stream_instance.h,v 1.19 2007/09/07 22:24:41 strk Exp $
#ifndef GNASH_VIDEO_STREAM_INSTANCE_H
#define GNASH_VIDEO_STREAM_INSTANCE_H
@@ -44,7 +44,7 @@
public:
- video_stream_definition* m_def;
+ boost::intrusive_ptr<video_stream_definition> m_def;
video_stream_instance(video_stream_definition* def,
character* parent, int id);
Index: server/parser/video_stream_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/video_stream_def.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/parser/video_stream_def.cpp 27 Aug 2007 12:44:29 -0000 1.12
+++ server/parser/video_stream_def.cpp 7 Sep 2007 22:24:41 -0000 1.13
@@ -16,7 +16,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: video_stream_def.cpp,v 1.12 2007/08/27 12:44:29 strk Exp $
+// $Id: video_stream_def.cpp,v 1.13 2007/09/07 22:24:41 strk Exp $
#include "video_stream_def.h"
#include "video_stream_instance.h"
@@ -137,12 +137,21 @@
}
void
-video_stream_definition::get_frame_data(int frameNum, uint8_t** data, int*
size){
- if (m_video_frames.size() == 0) return;
+video_stream_definition::get_frame_data(int frameNum, uint8_t** data, int*
size)
+{
int cur_frame = frameNum - m_start_frame;
+ if ( cur_frame < 0 || cur_frame >= m_video_frames.size() )
+ {
+ log_error(_("No video data available for frame %d."), frameNum);
+ *data = 0;
+ *size = 0;
+ return;
+ }
+
+ assert( cur_frame < m_video_frames_size.size() );
*size = m_video_frames_size[cur_frame];
*data = m_video_frames[cur_frame];
}
-}
+} // namespace gnash
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog server/video_stream_instance.h ...,
Sandro Santilli <=