gnash-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gnash-commit] gnash ChangeLog server/edit_text_character_def....


From: Sandro Santilli
Subject: [Gnash-commit] gnash ChangeLog server/edit_text_character_def....
Date: Sun, 13 Aug 2006 16:45:11 +0000

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/08/13 16:45:11

Modified files:
        .              : ChangeLog 
        server         : edit_text_character_def.cpp 
                         shape_character_def.cpp sprite_definition.cpp 
                         styles.cpp text.cpp tools.cpp types.cpp 
                         stream.cpp 
        server/swf     : tag_loaders.cpp 

Log message:
                * server/edit_text_character_def.cpp, 
server/shape_character_def.cpp,            server/sprite_definition.cpp, 
server/styles.cpp, server/text.cpp,               server/tools.cpp, 
server/types.cpp, server/swf/tag_loaders.cpp:
                remove newline ending from log_parse calls.
                * server/stream.cpp (open_tag): add SWF offset in parse logging.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.636&r2=1.637
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character_def.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shape_character_def.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_definition.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/styles.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/text.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/server/tools.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/types.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.23&r2=1.24

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.636
retrieving revision 1.637
diff -u -b -r1.636 -r1.637
--- ChangeLog   13 Aug 2006 16:39:18 -0000      1.636
+++ ChangeLog   13 Aug 2006 16:45:11 -0000      1.637
@@ -1,3 +1,10 @@
+2006-08-13 Sandro Santilli  <address@hidden>
+
+       * server/edit_text_character_def.cpp, server/shape_character_def.cpp,
+        server/sprite_definition.cpp, server/styles.cpp, server/text.cpp,
+        server/tools.cpp, server/types.cpp, server/swf/tag_loaders.cpp:
+       remove newline ending from log_parse calls.
+       * server/stream.cpp (open_tag): add SWF offset in parse logging.
 
 2006-08-13 Sandro Santilli  <address@hidden>
 

Index: server/edit_text_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character_def.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/edit_text_character_def.cpp  8 Aug 2006 09:50:54 -0000       1.8
+++ server/edit_text_character_def.cpp  13 Aug 2006 16:45:11 -0000      1.9
@@ -87,11 +87,11 @@
        IF_VERBOSE_PARSE (
        log_parse("edit_text_char:\n"
                  " default varname = %s\n"
-                 " text = ``%s''\n",
+                       " text = ``%s''\n"
+                       " font_id: %d\n"
+                       " text_height: %d",
                  m_default_name.c_str(),
-                 m_default_text.c_str());
-       log_parse(" font_id: %d\n"
-                 " text_height: %d\n",
+                       m_default_text.c_str(),
                  m_font_id,
                  m_text_height);
        );

Index: server/shape_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/shape_character_def.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/shape_character_def.cpp      8 Aug 2006 09:50:54 -0000       1.6
+++ server/shape_character_def.cpp      13 Aug 2006 16:45:11 -0000      1.7
@@ -67,7 +67,7 @@
     }
 
                IF_VERBOSE_PARSE (
-    log_parse("  read_fill_styles: count = %d\n", fill_style_count);
+    log_parse("  read_fill_styles: count = %d", fill_style_count);
                );
 
     // Read the styles. 
@@ -88,7 +88,7 @@
     
                IF_VERBOSE_PARSE
                (
-    log_parse("  read_line_styles: count = %d\n", line_style_count);
+    log_parse("  read_line_styles: count = %d", line_style_count);
                );
 
     // @@ does the 0xFF flag apply to all tag types?
@@ -98,7 +98,7 @@
        line_style_count = in->read_u16();
                IF_VERBOSE_PARSE
                (
-       log_parse("  read_line_styles: count2 = %d\n", line_style_count);
+       log_parse("  read_line_styles: count2 = %d", line_style_count);
                );
     }
     // }
@@ -198,7 +198,7 @@
                IF_VERBOSE_PARSE
                (
                if (SHAPE_LOG) 
-                   log_parse("  shape_character read: moveto %4g %4g\n", x, y);
+                   log_parse("  shape_character read: moveto %4g %4g", x, y);
                );
            }
            if ((flags & 0x02) && num_fill_bits > 0) {
@@ -217,7 +217,7 @@
                IF_VERBOSE_PARSE
                (
                if (SHAPE_LOG) {
-                   log_parse("  shape_character read: fill0 = %d\n", 
current_path.m_fill0);
+                   log_parse("  shape_character read: fill0 = %d", 
current_path.m_fill0);
                }
                );
                
@@ -237,7 +237,7 @@
                current_path.m_fill1 = style;
                IF_VERBOSE_PARSE (
                if (SHAPE_LOG) {
-                   log_parse("  shape_character read: fill1 = %d\n", 
current_path.m_fill1);
+                   log_parse("  shape_character read: fill1 = %d", 
current_path.m_fill1);
                }
                );
            }
@@ -257,7 +257,7 @@
                IF_VERBOSE_PARSE (
                if (SHAPE_LOG)
                {
-                   log_parse("  shape_character_read: line = %d\n", 
current_path.m_line);
+                   log_parse("  shape_character_read: line = %d", 
current_path.m_line);
                }
                );
            }
@@ -268,7 +268,7 @@
                assert(tag_type >= 22);
 
                IF_VERBOSE_PARSE (
-               log_parse("  shape_character read: more fill styles\n");
+               log_parse("  shape_character read: more fill styles");
                );
 
                // Store the current path if any.
@@ -308,7 +308,7 @@
                IF_VERBOSE_PARSE (
                if (SHAPE_LOG)
                {
-                   log_parse("  shape_character read: curved edge   = %4g %4g 
- %4g %4g - %4g %4g\n", x, y, cx, cy, ax, ay);
+                   log_parse("  shape_character read: curved edge   = %4g %4g 
- %4g %4g - %4g %4g", x, y, cx, cy, ax, ay);
                }
                );
 
@@ -339,7 +339,7 @@
                IF_VERBOSE_PARSE (
                if (SHAPE_LOG)
                {
-                   log_parse("  shape_character_read: straight edge = %4g %4g 
- %4g %4g\n", x, y, x + dx, y + dy);
+                   log_parse("  shape_character_read: straight edge = %4g %4g 
- %4g %4g", x, y, x + dx, y + dy);
                }
                );
 

Index: server/sprite_definition.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_definition.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/sprite_definition.cpp        8 Aug 2006 09:50:54 -0000       1.12
+++ server/sprite_definition.cpp        13 Aug 2006 16:45:11 -0000      1.13
@@ -99,7 +99,7 @@
        m_playlist.resize(m_frame_count);
 
                IF_VERBOSE_PARSE (
-       log_parse("  frames = %d\n", m_frame_count);
+       log_parse("  frames = %u", m_frame_count);
                );
 
        m_loading_frame = 0;
@@ -120,7 +120,7 @@
                {
                        // show frame tag -- advance to the next frame.
                        IF_VERBOSE_PARSE (
-                   log_parse("  show_frame (sprite)\n");
+                   log_parse("  show_frame (sprite)");
                        );
                    m_loading_frame++;
                }
@@ -133,7 +133,7 @@
                else
                {
                        // no tag loader for this tag type.
-                    log_error("*** no tag loader for type %d\n",
+                    log_error("*** no tag loader for type %d (sprite)",
                               tag_type);
                }
 
@@ -141,7 +141,7 @@
        }
 
                IF_VERBOSE_PARSE (
-       log_parse("  -- sprite END --\n");
+       log_parse("  -- sprite END --");
                );
 }
 

Index: server/styles.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/styles.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/styles.cpp   8 Aug 2006 10:51:36 -0000       1.15
+++ server/styles.cpp   13 Aug 2006 16:45:11 -0000      1.16
@@ -61,7 +61,7 @@
 
                IF_VERBOSE_PARSE
                (
-    log_parse("  fill_style read type = 0x%X\n", m_type);
+    log_parse("  fill_style read type = 0x%X", m_type);
                );
 
     if (m_type == SWF::FILL_SOLID)
@@ -126,7 +126,7 @@
 
                IF_VERBOSE_PARSE
                (
-        log_parse("  gradients: num_gradients = %d\n", num_gradients);
+        log_parse("  gradients: num_gradients = %d", num_gradients);
                );
 
         // @@ hack.
@@ -156,7 +156,7 @@
         int    bitmap_char_id = in->read_u16();
        IF_VERBOSE_PARSE
        (
-               log_parse("  bitmap_char = %d\n", bitmap_char_id);
+               log_parse("  bitmap_char = %d", bitmap_char_id);
        );
 
         // Look up the bitmap character.

Index: server/text.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/text.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/text.cpp     8 Aug 2006 10:16:25 -0000       1.22
+++ server/text.cpp     13 Aug 2006 16:45:11 -0000      1.23
@@ -190,7 +190,7 @@
                int     advance_bits = in->read_u8();
 
                IF_VERBOSE_PARSE(
-               log_parse("begin text records\n");
+               log_parse("begin text records");
                );
 
                bool    last_record_was_style_change = false;
@@ -204,7 +204,7 @@
                        {
                                // This is the end of the text records.
                                IF_VERBOSE_PARSE(
-                               log_parse("end text records\n");
+                               log_parse("end text records");
                                );
                                break;
                        }
@@ -223,7 +223,7 @@
                                bool    has_x_offset = (first_byte >> 0) & 1;
 
                                IF_VERBOSE_PARSE(
-                               log_parse("  text style change\n");
+                               log_parse("  text style change");
                                );
 
                                if (has_font)
@@ -231,7 +231,7 @@
                                        uint16_t        font_id = 
in->read_u16();
                                        style.m_font_id = font_id;
                                        IF_VERBOSE_PARSE(
-                                       log_parse("  has_font: font id = %d\n", 
font_id);
+                                       log_parse("  has_font: font id = %d", 
font_id);
                                        );
                                }
                                if (has_color)
@@ -246,7 +246,7 @@
                                                style.m_color.read_rgba(in);
                                        }
                                        IF_VERBOSE_PARSE(
-                                       log_parse("  has_color\n");
+                                       log_parse("  has_color");
                                        );
                                }
                                if (has_x_offset)
@@ -254,7 +254,7 @@
                                        style.m_has_x_offset = true;
                                        style.m_x_offset = in->read_s16();
                                        IF_VERBOSE_PARSE(
-                                       log_parse("  has_x_offset = %g\n", 
style.m_x_offset);
+                                       log_parse("  has_x_offset = %g", 
style.m_x_offset);
                                        );
                                }
                                else
@@ -267,7 +267,7 @@
                                        style.m_has_y_offset = true;
                                        style.m_y_offset = in->read_s16();
                                        IF_VERBOSE_PARSE(
-                                       log_parse("  has_y_offset = %g\n", 
style.m_y_offset);
+                                       log_parse("  has_y_offset = %g", 
style.m_y_offset);
                                        );
                                }
                                else
@@ -279,7 +279,7 @@
                                {
                                        style.m_text_height = in->read_u16();
                                        IF_VERBOSE_PARSE(
-                                       log_parse("  text_height = %g\n", 
style.m_text_height);
+                                       log_parse("  text_height = %g", 
style.m_text_height);
                                        );
                                }
                        }
@@ -302,7 +302,7 @@
                                m_text_glyph_records.back().read(in, 
glyph_count, glyph_bits, advance_bits);
 
                                IF_VERBOSE_PARSE(
-                               log_parse("  glyph_records: count = %d\n", 
glyph_count);
+                               log_parse("  glyph_records: count = %d", 
glyph_count);
                                );
                        }
                }

Index: server/tools.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/tools.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/tools.cpp    8 May 2006 21:12:24 -0000       1.2
+++ server/tools.cpp    13 Aug 2006 16:45:11 -0000      1.3
@@ -187,7 +187,7 @@
                return -1;
 #endif
 
-               IF_VERBOSE_PARSE(log_msg("file is compressed.\n"));
+               IF_VERBOSE_PARSE(log_msg("file is compressed."));
                original_in = in;
 
                // Uncompress the input as we read it.

Index: server/types.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/types.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/types.cpp    27 Jul 2006 01:47:11 -0000      1.7
+++ server/types.cpp    13 Aug 2006 16:45:11 -0000      1.8
@@ -168,8 +168,10 @@
        void    matrix::print() const
        // Debug log.
        {
-               log_parse("| %4.4f %4.4f %4.4f |\n", m_[0][0], m_[0][1], 
TWIPS_TO_PIXELS(m_[0][2]));
-               log_parse("| %4.4f %4.4f %4.4f |\n", m_[1][0], m_[1][1], 
TWIPS_TO_PIXELS(m_[1][2]));
+               IF_VERBOSE_PARSE( 
+               log_parse("| %4.4f %4.4f %4.4f |", m_[0][0], m_[0][1], 
TWIPS_TO_PIXELS(m_[0][2]));
+               log_parse("| %4.4f %4.4f %4.4f |", m_[1][0], m_[1][1], 
TWIPS_TO_PIXELS(m_[1][2]));
+               );
        }
 
        void    matrix::transform(point* result, const point& p) const
@@ -425,11 +427,13 @@
        void    cxform::print() const
        // Debug log.
        {
-               log_parse("    *         +\n");
-               log_parse("| %4.4f %4.4f|\n", m_[0][0], m_[0][1]);
-               log_parse("| %4.4f %4.4f|\n", m_[1][0], m_[1][1]);
-               log_parse("| %4.4f %4.4f|\n", m_[2][0], m_[2][1]);
-               log_parse("| %4.4f %4.4f|\n", m_[3][0], m_[3][1]);
+               IF_VERBOSE_PARSE(
+                       log_parse("    *         +");
+                       log_parse("| %4.4f %4.4f|", m_[0][0], m_[0][1]);
+                       log_parse("| %4.4f %4.4f|", m_[1][0], m_[1][1]);
+                       log_parse("| %4.4f %4.4f|", m_[2][0], m_[2][1]);
+                       log_parse("| %4.4f %4.4f|", m_[3][0], m_[3][1]);
+               );
        }
 
 
@@ -466,7 +470,9 @@
        void    rgba::print()
        // For debugging.
        {
-               log_parse("rgba: %d %d %d %d\n", m_r, m_g, m_b, m_a);
+               IF_VERBOSE_PARSE(
+                       log_parse("rgba: %d %d %d %d", m_r, m_g, m_b, m_a);
+               );
        }
 
        
@@ -496,14 +502,16 @@
 //             IF_DEBUG(log_msg("rect::read() nbits = %d\n", nbits));
        }
 
-       void    rect::print() const
        // Debug spew.
+       void    rect::print() const
        {
-               log_parse("xmin = %g, ymin = %g, xmax = %g, ymax = %g\n",
+               IF_VERBOSE_PARSE (
+               log_parse("xmin = %g, ymin = %g, xmax = %g, ymax = %g",
                        TWIPS_TO_PIXELS(m_x_min),
                        TWIPS_TO_PIXELS(m_y_min),
                        TWIPS_TO_PIXELS(m_x_max),
                        TWIPS_TO_PIXELS(m_y_max));
+               );
        }
 
        

Index: server/stream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/stream.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/stream.cpp   8 Aug 2006 09:50:54 -0000       1.7
+++ server/stream.cpp   13 Aug 2006 16:45:11 -0000      1.8
@@ -231,7 +231,8 @@
                }
 
                IF_VERBOSE_PARSE (
-               log_parse("---------------tag type = %d, tag length = %d\n", 
tag_type, tag_length);
+                       log_parse("SWF[%u]: tag type = %d, tag length = %d",
+                       get_position(), tag_type, tag_length);
                );
                        
                // Remember where the end of the tag is, so we can

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/swf/tag_loaders.cpp  8 Aug 2006 09:50:54 -0000       1.23
+++ server/swf/tag_loaders.cpp  13 Aug 2006 16:45:11 -0000      1.24
@@ -163,7 +163,7 @@
 
                IF_VERBOSE_PARSE
                (
-           log_parse("  set_background_color: (%d %d %d)\n",
+           log_parse("  set_background_color: (%d %d %d)",
                      m_color.m_r, m_color.m_g, m_color.m_b);
                );
        }
@@ -190,6 +190,11 @@
 {
     assert(tag == SWF::JPEGTABLES);
 
+       IF_VERBOSE_PARSE
+       (
+    log_parse("  jpeg_tables_loader");
+       );
+
 #if TU_CONFIG_LINK_TO_JPEGLIB
     jpeg::input*       j_in = 
jpeg::input::create_swf_jpeg2_header_only(in->get_underlying_stream());
     assert(j_in);
@@ -205,6 +210,7 @@
 define_bits_jpeg_loader(stream* in, tag_type tag, movie_definition* m)
 {
     assert(tag == SWF::DEFINEBITS); // 6
+       assert(in);
 
     uint16_t   character_id = in->read_u16();
 
@@ -250,7 +256,8 @@
 
                IF_VERBOSE_PARSE
                (
-    log_parse("  define_bits_jpeg2_loader: charid = %d pos = 0x%x\n", 
character_id, in->get_position());
+               log_parse("  define_bits_jpeg2_loader: charid = %d pos = 0x%x",
+                       character_id, in->get_position());
                );
 
     //
@@ -348,7 +355,8 @@
 
                IF_VERBOSE_PARSE
                (
-    log_parse("  define_bits_jpeg3_loader: charid = %d pos = 0x%x\n", 
character_id, in->get_position());
+               log_parse("  define_bits_jpeg3_loader: charid = %d pos = 0x%x",
+                       character_id, in->get_position());
                );
 
     uint32_t   jpeg_size = in->read_u32();
@@ -415,7 +423,8 @@
 
                IF_VERBOSE_PARSE
                (
-    log_parse("  defbitslossless2: tag = %d, id = %d, fmt = %d, w = %d, h = 
%d\n",
+               log_parse("  defbitslossless2: tag = %d, id = %d, "
+                       "fmt = %d, w = %d, h = %d",
                             tag,
                             character_id,
                             bitmap_format,
@@ -674,7 +683,7 @@
 
                IF_VERBOSE_PARSE
                (
-    log_parse("  shape_loader: id = %d\n", character_id);
+    log_parse("  shape_loader: id = %d", character_id);
     log_parse("  bound rect:"); ch->get_bound().print();
                );
 
@@ -688,7 +697,7 @@
 
                IF_VERBOSE_PARSE
                (
-    log_parse("  shape_morph_loader: id = %d\n", character_id);
+    log_parse("  shape_morph_loader: id = %d", character_id);
                );
 
     morph2_character_def* morph = new morph2_character_def;
@@ -804,11 +813,8 @@
 
                IF_VERBOSE_PARSE
                (
-                   log_parse("  char_id = %d\n"
-                           "  depth = %d\n"
-                           "  mat = \n",
-                           m_character_id,
-                           m_depth);
+                       log_parse("  char_id = %d", m_character_id);
+                       log_parse("  depth = %d", m_depth);
                    m_matrix.print();
                );
 
@@ -818,7 +824,8 @@
 
                IF_VERBOSE_PARSE
                (
-                           log_parse("  cxform:\n"); m_color_transform.print();
+                               log_parse("  cxform:");
+                               m_color_transform.print();
                );
 
                        }
@@ -842,14 +849,14 @@
 
                IF_VERBOSE_PARSE
                (
-                   log_parse("  depth = %d\n", m_depth);
+                   log_parse("  depth = %d", m_depth);
                );
 
                    if (has_char) {
                        m_character_id = in->read_u16();
                IF_VERBOSE_PARSE
                (
-                       log_parse("  char id = %d\n", m_character_id);
+                       log_parse("  char id = %d", m_character_id);
                );
                    }
 
@@ -858,7 +865,8 @@
                        m_matrix.read(in);
                IF_VERBOSE_PARSE
                (
-                       log_parse("  mat:\n"); m_matrix.print();
+                       log_parse("  mat:");
+                       m_matrix.print();
                );
                    }
                    if (has_cxform) {
@@ -866,7 +874,8 @@
                        m_color_transform.read_rgba(in);
                IF_VERBOSE_PARSE
                (
-                       log_parse("  cxform:\n"); m_color_transform.print();
+                       log_parse("  cxform:");
+                       m_color_transform.print();
                );
                    }
                                
@@ -874,7 +883,7 @@
                        m_ratio = (float)in->read_u16() / (float)65535;
                IF_VERBOSE_PARSE
                (
-                       log_parse("  ratio: %f\n", m_ratio);
+                       log_parse("  ratio: %f", m_ratio);
                );
                    }
                                
@@ -882,14 +891,14 @@
                        m_name = in->read_string();
                IF_VERBOSE_PARSE
                (
-                       log_parse("  name = %s\n", m_name ? m_name : "<null>");
+                       log_parse("  name = %s", m_name ? m_name : "<null>");
                );
                    }
                    if (has_clip_bracket) {
                        m_clip_depth = in->read_u16(); 
                IF_VERBOSE_PARSE
                (
-                       log_parse("  clip_depth = %d\n", m_clip_depth);
+                       log_parse("  clip_depth = %d", m_clip_depth);
                );
                    }
                    if (has_actions)
@@ -904,7 +913,7 @@
 
                IF_VERBOSE_PARSE
                (
-                           log_parse("  actions: flags = 0x%X\n", all_flags);
+                           log_parse("  actions: flags = 0x%X", all_flags);
                );
 
                            // Read swf_events.
@@ -1139,7 +1148,7 @@
 
                IF_VERBOSE_PARSE
                (
-    log_parse("  place_object_2\n");
+    log_parse("  place_object_2");
                );
 
     place_object_2*    ch = new place_object_2;
@@ -1158,7 +1167,7 @@
 
                IF_VERBOSE_PARSE
                (
-       log_parse("  sprite\n  char id = %d\n", character_id);
+       log_parse("  sprite:  char id = %d", character_id);
                );
 
        /// A DEFINESPRITE tag as part of a DEFINESPRITE
@@ -1250,7 +1259,7 @@
 
                IF_VERBOSE_PARSE
                (
-    log_parse("  remove_object_2(%d)\n", t->m_depth);
+    log_parse("  remove_object_2(%d)", t->m_depth);
                );
 
     m->add_execute_tag(t);
@@ -1278,7 +1287,7 @@
 
                IF_VERBOSE_PARSE
                (
-    log_parse("  button character loader: char_id = %d\n", character_id);
+    log_parse("  button character loader: char_id = %d", character_id);
                );
 
     button_character_definition*       ch = new button_character_definition;
@@ -1302,7 +1311,7 @@
 
                IF_VERBOSE_PARSE
                (
-    log_parse("  export: count = %d\n", count);
+    log_parse("  export: count = %d", count);
                );
 
     // Read the exports.
@@ -1310,7 +1319,7 @@
        {
            uint16_t    id = in->read_u16();
            char*       symbol_name = in->read_string();
-           log_parse("  export: id = %d, name = %s\n", id, symbol_name);
+           log_parse("  export: id = %d, name = %s", id, symbol_name);
 
            if (font* f = m->get_font(id))
                {
@@ -1351,7 +1360,7 @@
 
                IF_VERBOSE_PARSE
                (
-    log_parse("  import: source_url = %s, count = %d\n", source_url, count);
+    log_parse("  import: source_url = %s, count = %d", source_url, count);
                );
 
     // Try to load the source movie into the movie library.
@@ -1380,7 +1389,7 @@
            char*       symbol_name = in->read_string();
                IF_VERBOSE_PARSE
                (
-           log_parse("  import: id = %d, name = %s\n", id, symbol_name);
+           log_parse("  import: id = %d, name = %s", id, symbol_name);
                )
            
            if (s_no_recurse_while_loading)
@@ -1432,7 +1441,7 @@
        edit_text_character_def* ch = new edit_text_character_def(m);
                IF_VERBOSE_PARSE
                (
-       log_parse("edit_text_char, id = %d\n", character_id);
+       log_parse("edit_text_char, id = %d", character_id);
                );
        ch->read(in, tag, m);
 
@@ -1450,7 +1459,7 @@
        text_character_def* ch = new text_character_def(m);
                IF_VERBOSE_PARSE
                (
-       log_parse("text_character, id = %d\n", character_id);
+       log_parse("text_character, id = %d", character_id);
                );
        ch->read(in, tag, m);
 
@@ -1532,7 +1541,7 @@
        IF_VERBOSE_PARSE
        (
                log_parse("define sound: ch=%d, format=%d, "
-                       "rate=%d, 16=%d, stereo=%d, ct=%d\n",
+                       "rate=%d, 16=%d, stereo=%d, ct=%d",
                        character_id, int(format), sample_rate,
                        int(sample_16bit), int(stereo), sample_count);
        );
@@ -1619,7 +1628,7 @@
 
                IF_VERBOSE_PARSE
                (
-               log_parse("start_sound tag: id=%d, stop = %d, loop ct = %d\n",
+               log_parse("start_sound tag: id=%d, stop = %d, loop ct = %d",
                          sound_id, int(sst->m_stop_playback), 
sst->m_loop_count);
                );
        }
@@ -1671,7 +1680,7 @@
 
                IF_VERBOSE_PARSE
                (
-       log_parse("sound stream head: format=%d, rate=%d, 16=%d, stereo=%d, 
ct=%d\n",
+       log_parse("sound stream head: format=%d, rate=%d, 16=%d, stereo=%d, 
ct=%d",
                  int(format), sample_rate, int(sample_16bit), int(stereo), 
sample_count);
                );
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]