[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/asobj/NetStreamFfmpeg.cp...
From: |
Tomas Groth |
Subject: |
[Gnash-commit] gnash ChangeLog server/asobj/NetStreamFfmpeg.cp... |
Date: |
Fri, 30 Mar 2007 22:58:11 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Tomas Groth <tgc> 07/03/30 22:58:11
Modified files:
. : ChangeLog
server/asobj : NetStreamFfmpeg.cpp NetStreamGst.cpp
Log message:
* server/asobj/NetStream{Ffmpeg,Gst}.cpp: Fixed the callback
to the onStatus eventhandler.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2736&r2=1.2737
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.18&r2=1.19
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2736
retrieving revision 1.2737
diff -u -b -r1.2736 -r1.2737
--- ChangeLog 30 Mar 2007 14:58:26 -0000 1.2736
+++ ChangeLog 30 Mar 2007 22:58:10 -0000 1.2737
@@ -1,3 +1,8 @@
+2007-03-30 Tomas Groth Christensen <address@hidden>
+
+ * server/asobj/NetStream{Ffmpeg,Gst}.cpp: Fixed the callback
+ to the onStatus eventhandler.
+
2007-03-30 Sandro Santilli <address@hidden>
* server/asobj/Mouse.cpp: cleanups.
Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/asobj/NetStreamFfmpeg.cpp 30 Mar 2007 13:57:27 -0000 1.26
+++ server/asobj/NetStreamFfmpeg.cpp 30 Mar 2007 22:58:11 -0000 1.27
@@ -14,7 +14,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: NetStreamFfmpeg.cpp,v 1.26 2007/03/30 13:57:27 tgc Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.27 2007/03/30 22:58:11 tgc Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -934,7 +934,7 @@
// Check if there are any new status messages, and if we should
// pass them to a event handler
as_value status;
- if (m_statusChanged && get_member(std::string("onStatus"), &status) &&
status.to_as_function() != NULL) {
+ if (m_statusChanged && get_member(std::string("onStatus"), &status) &&
status.is_function()) {
for (int i = m_status_messages.size()-1; i >= 0; --i) {
boost::intrusive_ptr<as_object> o = new as_object();
@@ -945,9 +945,9 @@
} else {
o->init_member(std::string("level"),
as_value("error"), as_prop_flags::dontDelete|as_prop_flags::dontEnum);
}
- m_env->push(o.get());
+ m_env->push_val(as_value(o.get()));
- call_method0(status, m_env, this);
+ call_method(status, m_env, this, 1,
m_env->get_top_index() );
}
m_status_messages.clear();
Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/asobj/NetStreamGst.cpp 30 Mar 2007 13:57:27 -0000 1.18
+++ server/asobj/NetStreamGst.cpp 30 Mar 2007 22:58:11 -0000 1.19
@@ -677,7 +677,7 @@
// Check if there are any new status messages, and if we should
// pass them to a event handler
as_value status;
- if (m_statusChanged && get_member(std::string("onStatus"), &status) &&
status.to_as_function() != NULL) {
+ if (m_statusChanged && get_member(std::string("onStatus"), &status) &&
status.is_function()) {
for (int i = m_status_messages.size()-1; i >= 0; --i) {
boost::intrusive_ptr<as_object> o = new as_object();
@@ -688,9 +688,10 @@
} else {
o->init_member(std::string("level"),
as_value("error"), as_prop_flags::dontDelete|as_prop_flags::dontEnum);
}
- m_env->push(o.get());
+ m_env->push_val(as_value(o.get()));
+
+ call_method(status, m_env, this, 1,
m_env->get_top_index() );
- call_method0(status, m_env, this);
}
m_status_messages.clear();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog server/asobj/NetStreamFfmpeg.cp...,
Tomas Groth <=