diff --git a/direct/src/plugin/p3dInstanceManager.cxx b/direct/src/plugin/p3dInstanceManager.cxx index 5aec8115be..e8fdd01f46 100644 --- a/direct/src/plugin/p3dInstanceManager.cxx +++ b/direct/src/plugin/p3dInstanceManager.cxx @@ -59,7 +59,6 @@ P3DInstanceManager() { //////////////////////////////////////////////////////////////////// P3DInstanceManager:: ~P3DInstanceManager() { - nout << "~P3DInstanceManager\n" << flush; if (_started_notify_thread) { _notify_ready.acquire(); _notify_thread_continue = false; @@ -71,7 +70,6 @@ P3DInstanceManager:: assert(_instances.empty()); assert(_sessions.empty()); - nout << "done ~P3DInstanceManager\n" << flush; } //////////////////////////////////////////////////////////////////// @@ -155,7 +153,6 @@ start_instance(P3DInstance *inst, const string &p3d_filename, //////////////////////////////////////////////////////////////////// void P3DInstanceManager:: finish_instance(P3DInstance *inst) { - nout << "finish_instance(" << inst << ")\n" << flush; Instances::iterator ii; ii = _instances.find(inst); assert(ii != _instances.end()); @@ -376,5 +373,4 @@ nt_thread_run() { _notify_ready.wait(); } _notify_ready.release(); - nout << "exiting nt_thread_run\n" << flush; } diff --git a/direct/src/plugin/p3dMultifileReader.cxx b/direct/src/plugin/p3dMultifileReader.cxx index 1952fdaf08..fcd65e4312 100644 --- a/direct/src/plugin/p3dMultifileReader.cxx +++ b/direct/src/plugin/p3dMultifileReader.cxx @@ -104,7 +104,6 @@ extract(const string &pathname, const string &to_dir, Subfiles::iterator si; for (si = _subfiles.begin(); si != _subfiles.end(); ++si) { const Subfile &s = (*si); - nout << s._filename << "\n"; string output_pathname = to_dir + "/" + s._filename; if (!mkfile_complete(output_pathname)) { diff --git a/direct/src/plugin/p3dPackage.cxx b/direct/src/plugin/p3dPackage.cxx index 722c08deb8..a14911a2a7 100755 --- a/direct/src/plugin/p3dPackage.cxx +++ b/direct/src/plugin/p3dPackage.cxx @@ -252,8 +252,6 @@ desc_file_download_finished(bool success) { //////////////////////////////////////////////////////////////////// void P3DPackage:: got_desc_file(TiXmlDocument *doc, bool freshly_downloaded) { - nout << "got desc file\n"; - TiXmlElement *xpackage = doc->FirstChildElement("package"); TiXmlElement *uncompressed_archive = NULL; TiXmlElement *compressed_archive = NULL; @@ -286,8 +284,6 @@ got_desc_file(TiXmlDocument *doc, bool freshly_downloaded) { component = component->NextSiblingElement("component"); } - nout << "got " << _components.size() << " components\n"; - // Verify all of the components. bool all_components_ok = true; Components::iterator ci; @@ -383,8 +379,6 @@ compressed_archive_download_finished(bool success) { //////////////////////////////////////////////////////////////////// void P3DPackage:: uncompress_archive() { - nout << "uncompressing " << _compressed_archive.get_filename() << "\n"; - string source_pathname = _package_dir + "/" + _compressed_archive.get_filename(); string target_pathname = _package_dir + "/" + _uncompressed_archive.get_filename(); @@ -517,8 +511,6 @@ uncompress_archive() { //////////////////////////////////////////////////////////////////// void P3DPackage:: extract_archive() { - nout << "extracting " << _uncompressed_archive.get_filename() << "\n"; - string source_pathname = _package_dir + "/" + _uncompressed_archive.get_filename(); P3DMultifileReader reader; if (!reader.extract(source_pathname, _package_dir, @@ -529,7 +521,6 @@ extract_archive() { return; } - nout << "done extracting\n"; report_done(true); } @@ -556,8 +547,6 @@ report_progress(double progress) { //////////////////////////////////////////////////////////////////// void P3DPackage:: report_done(bool success) { - nout << "report_done(" << success << "), " - << _callbacks.size() << " callbacks\n"; if (success) { _ready = true; _failed = false; diff --git a/direct/src/plugin/p3dPythonObject.cxx b/direct/src/plugin/p3dPythonObject.cxx index 1ba0968244..bda01c6b8e 100644 --- a/direct/src/plugin/p3dPythonObject.cxx +++ b/direct/src/plugin/p3dPythonObject.cxx @@ -205,7 +205,6 @@ call(const string &method_name, P3D_object *params[], int num_params) const { doc->LinkEndChild(decl); doc->LinkEndChild(xcommand); TiXmlDocument *response = _session->command_and_response(doc); - nout << "call response pointer: " << response << "\n" << flush; P3D_object *result = NULL; if (response != NULL) { @@ -219,10 +218,6 @@ call(const string &method_name, P3D_object *params[], int num_params) const { delete response; } - nout << "call result = " << result << "\n" << flush; - if (result != NULL) { - nout << " result = " << *result << "\n" << flush; - } return result; }