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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/06/19 15:34:25

Modified files:
        .              : ChangeLog 
        server/asobj   : Sound.cpp 

Log message:
        * server/asobj/Sound.cpp (sound_loadsound): second argument
          is NOT mandatory. log warning when passed more then two args
          (in case we miss something).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6978&r2=1.6979
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Sound.cpp?cvsroot=gnash&r1=1.33&r2=1.34

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6978
retrieving revision 1.6979
diff -u -b -r1.6978 -r1.6979
--- ChangeLog   19 Jun 2008 11:49:15 -0000      1.6978
+++ ChangeLog   19 Jun 2008 15:34:16 -0000      1.6979
@@ -1,3 +1,9 @@
+2008-06-19 Sandro Santilli <address@hidden>
+
+       * server/asobj/Sound.cpp (sound_loadsound): second argument
+         is NOT mandatory. log warning when passed more then two args
+         (in case we miss something).
+
 2008-06-19 Benjamin Wolsey <address@hidden>
 
        * server/as_object.h: typeid can cope with null pointers, but

Index: server/asobj/Sound.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Sound.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- server/asobj/Sound.cpp      17 Jun 2008 12:42:21 -0000      1.33
+++ server/asobj/Sound.cpp      19 Jun 2008 15:34:21 -0000      1.34
@@ -570,15 +570,33 @@
 as_value
 sound_loadsound(const fn_call& fn)
 {
-       if (fn.nargs != 2) {
+       boost::intrusive_ptr<Sound> so = ensureType<Sound>(fn.this_ptr);
+
+       if (!fn.nargs)
+       {
                IF_VERBOSE_ASCODING_ERRORS(
-           log_aserror(_("loadSound needs 2 arguments"));
+               log_aserror(_("Sound.loadSound() needs at least 1 argument"));
                );
            return as_value();          
        }
 
-       boost::intrusive_ptr<Sound> so = ensureType<Sound>(fn.this_ptr);
-       so->loadSound(fn.arg(0).to_string(), fn.arg(1).to_bool());
+       std::string url = fn.arg(0).to_string();
+
+       bool streaming = false;
+       if ( fn.nargs > 1 )
+       {
+               streaming = fn.arg(1).to_bool();
+
+               IF_VERBOSE_ASCODING_ERRORS(
+               if ( fn.nargs > 2 )
+               {
+                       std::stringstream ss; fn.dump_args(ss);
+                       log_aserror(_("Sound.loadSound(%s): arguments after 
first 2 discarded"), ss.str());
+               }
+               );
+       }
+
+       so->loadSound(url, streaming);
 
        return as_value();
 }