[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/impl.cpp server/parser/m...
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] gnash ChangeLog server/impl.cpp server/parser/m... |
|
Date: |
Tue, 27 May 2008 13:27:26 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Benjamin Wolsey <bwy> 08/05/27 13:27:26
Modified files:
. : ChangeLog
server : impl.cpp
server/parser : movie_def_impl.cpp movie_def_impl.h
movie_definition.h
server/swf : tag_loaders.cpp
Log message:
* server/impl.cpp: clean up logging, drop the global bool
s_no_recurse_while_loading, which has been used to disable
parts
of the code since before Gnash existed.
* server/swf/tag_loaders.cpp: drop code depending
on the above bool being true.
* server/parser/movie_def_impl.{h,cpp},
server/parser/movie_definition.h: drop methods only used by
the
disabled code above. Cleanups in logging.
It seems that this code was on the way out more than two years
ago,
so is a waste of building time and doesn't make understanding
the
code any easier.
If it was in fact on the way in, it could be implemented better.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6722&r2=1.6723
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.144&r2=1.145
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.108&r2=1.109
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.h?cvsroot=gnash&r1=1.75&r2=1.76
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_definition.h?cvsroot=gnash&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.199&r2=1.200
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6722
retrieving revision 1.6723
diff -u -b -r1.6722 -r1.6723
--- ChangeLog 27 May 2008 13:24:58 -0000 1.6722
+++ ChangeLog 27 May 2008 13:27:24 -0000 1.6723
@@ -1,3 +1,14 @@
+2008-05-27 Benjamin Wolsey <address@hidden>
+
+ * server/impl.cpp: clean up logging, drop the global bool
+ s_no_recurse_while_loading, which has been used to disable parts
+ of the code since before Gnash existed.
+ * server/swf/tag_loaders.cpp: drop code depending
+ on the above bool being true.
+ * server/parser/movie_def_impl.{h,cpp},
+ server/parser/movie_definition.h: drop methods only used by the
+ disabled code above.
+
2008-05-27 Sandro Santilli <address@hidden>
* libbase/FLVParser.cpp (seek): have video stream drive
Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -b -r1.144 -r1.145
--- server/impl.cpp 30 Apr 2008 12:21:34 -0000 1.144
+++ server/impl.cpp 27 May 2008 13:27:24 -0000 1.145
@@ -97,7 +97,7 @@
// can call this only once during a single run
assert(!globals::baseurl.get());
globals::baseurl.reset(new URL(url));
- log_debug(_("Base url set to: %s"), globals::baseurl->str().c_str());
+ log_debug(_("Base url set to: %s"), globals::baseurl->str());
}
const URL&
@@ -290,11 +290,11 @@
// Put extracted info in the given vars.
// Sets *version to 0 if info can't be extracted.
{
- //log_debug(_("%s: url is %s"), __PRETTY_FUNCTION__, url.str().c_str());
+ //log_debug(_("%s: url is %s"), __PRETTY_FUNCTION__, url.str());
tu_file* in = globals::streamProvider.getStream(url);
if (in == NULL || in->get_error() != TU_FILE_NO_ERROR) {
- log_error(_("get_movie_info(): can't open '%s'"), url.str().c_str());
+ log_error(_("get_movie_info(): can't open '%s'"), url.str());
if (version) *version = 0;
//delete in;
return;
@@ -309,7 +309,7 @@
if ((header & 0x0FFFFFF) != 0x00535746
&& (header & 0x0FFFFFF) != 0x00535743) {
// ERROR
- log_error(_("get_movie_info(): file '%s' does not start with a SWF header"),
url.str().c_str());
+ log_error(_("get_movie_info(): file '%s' does not start with a SWF header"),
url.str());
if (version) *version = 0;
//delete in;
return;
@@ -380,7 +380,7 @@
if ( ! im.get() )
{
- log_error(_("Can't read jpeg from %s"), url.c_str());
+ log_error(_("Can't read jpeg from %s"), url);
return NULL;
}
@@ -403,7 +403,7 @@
if ( ! im.get() )
{
- log_error(_("Can't read png from %s"), url.c_str());
+ log_error(_("Can't read png from %s"), url);
return NULL;
}
@@ -535,34 +535,29 @@
return create_swf_movie(in, url, startLoaderThread);
}
- log_error(_("unknown file type (%s)"), type.c_str());
+ log_error(_("unknown file type (%s)"), type);
return NULL;
}
movie_definition*
create_movie(const URL& url, const char* reset_url, bool startLoaderThread,
const std::string* postdata)
{
- // URL::str() returns by value, save it to a local string
- std::string url_str = url.str();
- const char* c_url = url_str.c_str();
-
-// log_debug(_("%s: url is %s"), __PRETTY_FUNCTION__, c_url);
std::auto_ptr<tu_file> in;
if ( postdata ) in.reset( globals::streamProvider.getStream(url, *postdata)
);
else in.reset( globals::streamProvider.getStream(url) );
if ( ! in.get() )
{
- log_error(_("failed to open '%s'; can't create movie"), c_url);
+ log_error(_("failed to open '%s'; can't create movie"), url.str());
return NULL;
}
else if ( in->get_error() )
{
- log_error(_("streamProvider opener can't open '%s'"), c_url);
+ log_error(_("streamProvider opener can't open '%s'"), url.str());
return NULL;
}
- const char* movie_url = reset_url ? reset_url : c_url;
+ const char* movie_url = reset_url ? reset_url : url.str().c_str();
movie_definition* ret = create_movie(in, movie_url, startLoaderThread);
return ret;
@@ -570,16 +565,11 @@
}
-
-bool s_no_recurse_while_loading = false; // @@ TODO get rid of this; make it
the normal mode.
-
-
//
// global gnash management
//
-
void clear()
// Maximum release of resources.
{
@@ -790,7 +780,7 @@
//
movie_definition* create_library_movie(const URL& url, const char* real_url,
bool startLoaderThread, const std::string* postdata)
{
-// log_debug(_("%s: url is %s"), __PRETTY_FUNCTION__, url.str().c_str());
+// log_debug(_("%s: url is %s"), __PRETTY_FUNCTION__, url.str());
// Use real_url as label for cache if available
std::string cache_label = real_url ? URL(real_url).str() : url.str();
@@ -801,7 +791,7 @@
boost::intrusive_ptr<movie_definition> m;
if ( s_movie_library.get(cache_label, &m) )
{
- log_debug(_("Movie %s already in library"), cache_label.c_str());
+ log_debug(_("Movie %s already in library"), cache_label);
return m.get();
}
}
@@ -811,12 +801,12 @@
// calling create_library_movie() again and NOT finding
// the just-created movie.
movie_definition* mov = create_movie(url, real_url, false, postdata);
- //log_debug(_("create_movie(%s, %s, false) returned %p"), url.str().c_str(),
real_url, mov);
+ //log_debug(_("create_movie(%s, %s, false) returned %p"), url.str(),
real_url, mov);
if (mov == NULL)
{
log_error(_("Couldn't load library movie '%s'"),
- url.str().c_str());
+ url.str());
return NULL;
}
@@ -824,11 +814,11 @@
if ( ! postdata ) // don't add if we POSTed
{
s_movie_library.add(cache_label, mov);
- log_debug(_("Movie %s (SWF%d) added to library"), cache_label.c_str(),
mov->get_version());
+ log_debug(_("Movie %s (SWF%d) added to library"), cache_label,
mov->get_version());
}
else
{
- log_debug(_("Movie %s (SWF%d) NOT added to library (resulted from a
POST)"), cache_label.c_str(), mov->get_version());
+ log_debug(_("Movie %s (SWF%d) NOT added to library (resulted from a
POST)"), cache_label, mov->get_version());
}
// Now complete the load if the movie is an SWF movie
@@ -845,7 +835,7 @@
}
}
- //log_debug(_("create_library_movie(%s, %s, startLoaderThread=%d) about to
return %p"), url.str().c_str(), real_url, startLoaderThread, mov);
+ //log_debug(_("create_library_movie(%s, %s, startLoaderThread=%d) about to
return %p"), url.str(), real_url, startLoaderThread, mov);
return mov;
}
Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- server/parser/movie_def_impl.cpp 23 May 2008 15:21:27 -0000 1.108
+++ server/parser/movie_def_impl.cpp 27 May 2008 13:27:25 -0000 1.109
@@ -245,82 +245,6 @@
//assert(m_jpeg_in.get() == NULL);
}
-bool movie_def_impl::in_import_table(int character_id) const
-{
- for (size_t i = 0, n = m_imports.size(); i < n; i++)
- {
- if (m_imports[i].m_character_id == character_id)
- {
- return true;
- }
- }
- return false;
-}
-
-void movie_def_impl::visit_imported_movies(import_visitor& visitor)
-{
- // don't call the visitor twice for a single URL
- std::set<std::string> visited;
-
- for (size_t i = 0, n = m_imports.size(); i < n; i++)
- {
- const import_info& inf = m_imports[i];
- if (visited.insert(inf.m_source_url).second)
- {
- // Call back the visitor.
- visitor.visit(inf.m_source_url);
- }
- }
-}
-
-void movie_def_impl::resolve_import(const std::string& source_url,
movie_definition* source_movie)
-{
-
- // Iterate in reverse, since we remove stuff along the way.
- for (size_t i = m_imports.size(); i > 0; i--)
- {
- const import_info& inf = m_imports[i-1];
- if (inf.m_source_url == source_url)
- {
- // Do the import.
- boost::intrusive_ptr<resource> res =
source_movie->get_exported_resource(inf.m_symbol);
- bool imported = false;
-
- if (res == NULL)
- {
- log_error(_("import error: resource '%s' is not
exported from movie '%s'"),
- inf.m_symbol.c_str(),
source_url.c_str());
- }
- else if (font* f = res->cast_to_font())
- {
- // Add this shared font to our fonts.
- add_font(inf.m_character_id, f);
- imported = true;
- }
- else if (character_def* ch = res->cast_to_character_def())
- {
- // Add this character to our characters.
- add_character(inf.m_character_id, ch);
- imported = true;
- }
- else
- {
- log_error(_("import error: resource '%s' from
movie '%s' has unknown type"),
- inf.m_symbol.c_str(),
source_url.c_str());
- }
-
- if (imported)
- {
- // TODO: a std::list would be faster here
- m_imports.erase(m_imports.begin() + i);
-
- // Hold a ref, to keep this source
movie_definition alive.
- m_import_source_movies.push_back(source_movie);
- }
- }
- }
-}
-
void movie_def_impl::add_character(int character_id, character_def* c)
{
assert(c);
@@ -331,14 +255,6 @@
character_def*
movie_def_impl::get_character_def(int character_id)
{
-#ifndef NDEBUG
- // make sure character_id is resolved
- if (in_import_table(character_id))
- {
- log_error(_("get_character_def(): character_id %d is still waiting
to be imported"),
- character_id);
- }
-#endif // not NDEBUG
boost::mutex::scoped_lock lock(_dictionaryMutex);
@@ -357,14 +273,6 @@
font* movie_def_impl::get_font(int font_id) const
{
-#ifndef NDEBUG
- // make sure font_id is resolved
- if (in_import_table(font_id))
- {
- log_error(_("get_font(): font_id %d is still waiting to be
imported"),
- font_id);
- }
-#endif // not NDEBUG
FontMap::const_iterator it = m_fonts.find(font_id);
if ( it == m_fonts.end() ) return NULL;
@@ -518,7 +426,7 @@
IF_VERBOSE_PARSE(
m_frame_size.print();
- log_parse(_("frame rate = %f, frames = " SIZET_FMT),
+ log_parse(_("frame rate = %f, frames = %d"),
m_frame_rate, m_frame_count);
);
@@ -709,7 +617,7 @@
#endif
if ( ! ensure_frame_loaded(nextframe) )
{
- log_error(_("Could not advance to frame " SIZET_FMT),
+ log_error(_("Could not advance to frame %d"),
nextframe);
// these kind of errors should be handled by callers
abort();
@@ -797,7 +705,7 @@
log_swferror(_("last expected SHOWFRAME
"
"in SWF stream '%s' isn't "
"followed by an END (%d)."),
- get_url().c_str(), tag_type);
+ get_url(), tag_type);
);
}
goto parse_tag;
@@ -818,7 +726,7 @@
IF_VERBOSE_PARSE(
std::stringstream ss;
dump_tag_bytes(&str, ss);
- log_error("tag dump follows: %s",
ss.str().c_str());
+ log_error("tag dump follows: %s", ss.str());
);
}
@@ -841,7 +749,7 @@
if ( ! m_playlist[floaded].empty() )
{
IF_VERBOSE_MALFORMED_SWF(
- log_swferror(_(SIZET_FMT " control tags are NOT followed by"
+ log_swferror(_("%d control tags are NOT followed by"
" a SHOWFRAME tag"),
m_playlist[floaded].size());
);
@@ -850,7 +758,7 @@
if ( m_frame_count > floaded )
{
IF_VERBOSE_MALFORMED_SWF(
- log_swferror(_(SIZET_FMT " frames advertised in header, but
only " SIZET_FMT " SHOWFRAME tags "
+ log_swferror(_("%d frames advertised in header, but only %d
SHOWFRAME tags "
"found in stream. Pretending we loaded all advertised
frames"), m_frame_count, floaded);
);
boost::mutex::scoped_lock lock(_frames_loaded_mutex);
@@ -878,11 +786,9 @@
{
IF_VERBOSE_MALFORMED_SWF(
log_swferror(_("number of SHOWFRAME tags "
- "in SWF stream '%s' (" SIZET_FMT
- ") exceeds "
- "the advertised number in header ("
- SIZET_FMT ")."),
- get_url().c_str(), _frames_loaded,
+ "in SWF stream '%s' (%d) exceeds "
+ "the advertised number in header (%d)."),
+ get_url(), _frames_loaded,
m_frame_count);
);
//m_playlist.resize(_frames_loaded+1);
@@ -962,8 +868,8 @@
if ( new_loading_frame != loading_frame )
{
#ifdef DEBUG_EXPORTS
- log_debug(_("looking for exported resource: frame load
advancement (from "
- SIZET_FMT " to " SIZET_FMT ")"),
+ log_debug(_("looking for exported resource: frame load "
+ "advancement (from %d to %d)"),
loading_frame, new_loading_frame);
#endif
loading_frame = new_loading_frame;
@@ -979,17 +885,17 @@
"giving up on "
"get_exported_resource(%s): "
"circular IMPORTS?"),
- get_url().c_str(),
+ get_url(),
(def_timeout*naptime)/1000,
def_timeout*naptime,
def_timeout,
- symbol.c_str());
+ symbol);
return res;
}
#ifdef DEBUG_EXPORTS
log_debug(_("No frame progress at iteration %lu of
get_exported_resource(%s)"),
- timeout, symbol.c_str());
+ timeout, symbol);
#endif
continue; // not worth checking
@@ -1000,11 +906,11 @@
#ifdef DEBUG_EXPORTS
boost::mutex::scoped_lock lock(_exportedResourcesMutex);
log_debug(_("At end of stream, still no '%s' symbol
found "
- "in _exportedResources (" SIZET_FMT " entries
in it, "
- "follow)"), symbol.c_str(),
_exportedResources.size());
+ "in _exportedResources (%d entries in it, "
+ "follow)"), symbol, _exportedResources.size());
for (ExportMap::const_iterator
it=_exportedResources.begin(); it!=_exportedResources.end(); ++it)
{
- log_debug(" symbol %s (%s)", it->first.c_str(),
typeName(*(it->second)).c_str());
+ log_debug(" symbol %s (%s)", it->first,
typeName(*(it->second)));
}
#endif
return res;
Index: server/parser/movie_def_impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.h,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- server/parser/movie_def_impl.h 23 May 2008 15:21:28 -0000 1.75
+++ server/parser/movie_def_impl.h 27 May 2008 13:27:25 -0000 1.76
@@ -40,7 +40,6 @@
//
// Forward declarations
namespace gnash {
- class import_info;
class movie_def_impl;
class movie_root;
class sprite_instance;
@@ -53,34 +52,6 @@
namespace gnash
{
-//
-// Helper for movie_def_impl
-//
-
-class import_info
-{
-private:
- friend class movie_def_impl;
-
- std::string m_source_url;
- int m_character_id;
- std::string m_symbol;
-
- import_info()
- :
- m_character_id(-1)
- {
- }
-
- import_info(const std::string& source, int id, const std::string& symbol)
- :
- m_source_url(source),
- m_character_id(id),
- m_symbol(symbol)
- {
- }
-};
-
/// \brief
/// movie_def_impl helper class handling start and execution of
/// an SWF loading thread
@@ -232,9 +203,6 @@
// Mutex protecting access to _exportedResources
mutable boost::mutex _exportedResourcesMutex;
- /// Items we import.
- std::vector<import_info> m_imports;
-
/// Movies we import from; hold a ref on these,
/// to keep them alive
typedef std::vector<boost::intrusive_ptr<movie_definition> > ImportVect;
@@ -324,10 +292,6 @@
/// A flag set to true when load cancelation is requested
bool _loadingCanceled;
- /// Debug helper; returns true if the given
- /// character_id is listed in the import table.
- bool in_import_table(int character_id) const;
-
public:
movie_def_impl();
@@ -405,22 +369,6 @@
///
virtual boost::intrusive_ptr<resource> get_exported_resource(const
std::string& symbol);
- // see docs in movie_definition.h
- virtual void add_import(const std::string& source_url, int id, const
std::string& symbol)
- {
- assert(in_import_table(id) == false);
- m_imports.push_back(import_info(source_url, id, symbol));
- }
-
- /// \brief
- /// Calls back the visitor for each movie that we
- /// import symbols from.
- virtual void visit_imported_movies(import_visitor& visitor);
-
- // See docs in movie_definition.h
- virtual void resolve_import(const std::string& source_url,
- movie_definition* source_movie);
-
void add_character(int character_id, character_def* c);
/// \brief
Index: server/parser/movie_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_definition.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- server/parser/movie_definition.h 10 Apr 2008 03:52:07 -0000 1.44
+++ server/parser/movie_definition.h 27 May 2008 13:27:25 -0000 1.45
@@ -136,36 +136,6 @@
return NULL;
}
- //
- // (optional) API to support gnash::create_movie_no_recurse().
- //
-
- /// \brief
- /// Call visit_imported_movies() to retrieve a list of
- /// names of movies imported into this movie.
- //
- /// visitor.visit() will be called back with the name
- /// of each imported movie.
- ///
- class import_visitor
- {
- public:
- virtual ~import_visitor() {}
- virtual void visit(const std::string& imported_movie_filename) = 0;
- };
- virtual void visit_imported_movies(import_visitor& /*visitor*/) {}
-
- /// Call this to resolve an import of the given movie.
- //
- /// Replaces the dummy placeholder with the real
- /// movie_definition* given.
- ///
- /// The default implementation is a no-op.
- ///
- /// @see add_import
- ///
- virtual void resolve_import(const std::string& /*name*/,
- movie_definition* /*def*/) {}
//
// (optional) API to support host-driven creation of textures.
@@ -449,25 +419,6 @@
{
}
- /// \brief
- /// Adds an entry to a table of resources that need to
- /// be imported from other movies.
- //
- /// Client code must call resolve_import() later, when the
- /// source movie has been loaded, so that the actual resource
- /// can be used.
- ///
- /// This mechanism (add_import/resolve_import) is only used
- /// by the IMPORT tag loader if s_no_recurse_while_loading is
- /// true, which currently NEVER happens using the standard
- /// executables.
- ///
- /// The default implementation is a no-op.
- ///
- virtual void add_import(const std::string& /*source_url*/,
- int /*id*/, const std::string& /*symbol_name*/)
- {
- }
/// \brief
/// All bitmap_info's used by this movie should be
Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -b -r1.199 -r1.200
--- server/swf/tag_loaders.cpp 13 May 2008 07:55:01 -0000 1.199
+++ server/swf/tag_loaders.cpp 27 May 2008 13:27:25 -0000 1.200
@@ -64,13 +64,6 @@
namespace gnash {
- // @@ TODO get rid of this; make it the normal mode.
- extern bool s_no_recurse_while_loading;
-
-}
-
-namespace gnash {
-
namespace SWF {
namespace tag_loaders {
@@ -97,13 +90,6 @@
currPos(startPos)
{
assert(endPos > startPos);
-#if 0
- if (endPos <= startPos)
- {
- log_error("startPos: %lu, endPos: %lu", startPos,
endPos);
- abort();
- }
-#endif
}
static int readFunc(void* dst, int bytes, void* appdata)
@@ -964,7 +950,7 @@
log_swferror(_("DEFINEBUTTONSOUND refers to character id %d, "
"being a %s (expected a button definition)"),
button_character_id,
- typeName(*chdef).c_str());
+ typeName(*chdef));
);
return;
}
@@ -1031,7 +1017,7 @@
in->read_string(symbolName);
IF_VERBOSE_PARSE (
- log_parse(_(" export: id = %d, name = %s"), id,
symbolName.c_str());
+ log_parse(_(" export: id = %d, name = %s"), id, symbolName);
);
if (font* f = m->get_font(id))
@@ -1053,7 +1039,7 @@
IF_VERBOSE_MALFORMED_SWF(
log_swferror(_("don't know how to export resource '%s' "
"with id %d (can't find that id)"),
- symbolName.c_str(), id);
+ symbolName, id);
);
}
@@ -1091,25 +1077,25 @@
IF_VERBOSE_PARSE
(
- log_parse(_(" import: version = %u, source_url = %s (%s), count =
%d"), import_version, abs_url.str().c_str(), source_url.c_str(), count);
+ log_parse(_(" import: version = %u, source_url = %s (%s), count =
%d"),
+ import_version, abs_url.str(), source_url, count);
);
// Try to load the source movie into the movie library.
movie_definition* source_movie = NULL;
- if (s_no_recurse_while_loading == false)
- {
try {
source_movie = create_library_movie(abs_url);
} catch (gnash::GnashException& e) {
log_error(_("Exception: %s"), e.what());
source_movie = NULL;
}
+
if (source_movie == NULL)
{
// Give up on imports.
- log_error(_("can't import movie from url %s"),
abs_url.str().c_str());
+ log_error(_("can't import movie from url %s"), abs_url.str());
return;
}
@@ -1122,7 +1108,6 @@
);
return;
}
- }
// Get the imports.
for (int i = 0; i < count; i++)
@@ -1133,24 +1118,14 @@
in->read_string(symbolName);
IF_VERBOSE_PARSE
(
- log_parse(_(" import: id = %d, name = %s"), id,
symbolName.c_str());
+ log_parse(_(" import: id = %d, name = %s"), id, symbolName);
);
- if (s_no_recurse_while_loading)
- {
- m->add_import(source_url, id, symbolName.c_str()); // TODO: pass
the const ref of string instead
- }
- else
- {
- // @@ TODO get rid of this, always use
- // s_no_recurse_while_loading, change
- // create_movie().
-
boost::intrusive_ptr<resource> res =
source_movie->get_exported_resource(symbolName);
if (res == NULL)
{
log_error(_("import error: could not find resource '%s' in
movie '%s'"),
- symbolName.c_str(), source_url.c_str());
+ symbolName, source_url);
}
else if (font* f = res->cast_to_font())
{
@@ -1165,8 +1140,7 @@
else
{
log_error(_("import error: resource '%s' from movie '%s' has
unknown type"),
- symbolName.c_str(), source_url.c_str());
- }
+ symbolName, source_url);
}
}
@@ -1508,7 +1482,7 @@
if ( ! vdef )
{
IF_VERBOSE_MALFORMED_SWF(
- log_swferror(_("VideoFrame tag refers to a non-video character %d
(%s)"), character_id, typeName(*chdef).c_str());
+ log_swferror(_("VideoFrame tag refers to a non-video character %d
(%s)"), character_id, typeName(*chdef));
);
return;
}
@@ -1571,10 +1545,10 @@
in->read_string(metadata);
IF_VERBOSE_PARSE (
- log_parse(_(" metadata = [[\n%s\n]]"), metadata.c_str());
+ log_parse(_(" metadata = [[\n%s\n]]"), metadata);
);
- log_unimpl(_("METADATA tag unused: %s"), metadata.c_str());
+ log_unimpl(_("METADATA tag unused: %s"), metadata);
// TODO: attach to movie_definition instead
// (should we parse the XML maybe?)
@@ -1607,7 +1581,7 @@
ss << " - Build " << build;
ss << " - Timestamp " << timestamp;
- log_debug("%s", ss.str().c_str());
+ log_debug("%s", ss.str());
// attach to movie_definition ?
}
@@ -1664,10 +1638,8 @@
-// @@ lots of macros here! It seems that VC6 can't correctly
-// handle integer template args, although it's happy to
-// compile them?!
-
+// VC6 is a recognized pile of crap and no one should
+// worry about trying to support it.
class in_stream
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog server/impl.cpp server/parser/m...,
Benjamin Wolsey <=