TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-18 04:33:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

some more cleanup

Browse Source
This commit is contained in:
David Rose 2009-07-07 18:30:06 +00:00
parent af8f75dfbc
commit 7f7c3fe373
4 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
direct/src/plugin/p3dInstanceManager.cxx
View File

@ -59,7 +59,6 @@ P3DInstanceManager() {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
P3DInstanceManager:: P3DInstanceManager::
~P3DInstanceManager() { ~P3DInstanceManager() {
nout << "~P3DInstanceManager\n" << flush;
if (_started_notify_thread) { if (_started_notify_thread) {
_notify_ready.acquire(); _notify_ready.acquire();
_notify_thread_continue = false; _notify_thread_continue = false;
@ -71,7 +70,6 @@ P3DInstanceManager::
assert(_instances.empty()); assert(_instances.empty());
assert(_sessions.empty()); assert(_sessions.empty());
nout << "done ~P3DInstanceManager\n" << flush;
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -155,7 +153,6 @@ start_instance(P3DInstance *inst, const string &p3d_filename,
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void P3DInstanceManager:: void P3DInstanceManager::
finish_instance(P3DInstance *inst) { finish_instance(P3DInstance *inst) {
nout << "finish_instance(" << inst << ")\n" << flush;
Instances::iterator ii; Instances::iterator ii;
ii = _instances.find(inst); ii = _instances.find(inst);
assert(ii != _instances.end()); assert(ii != _instances.end());
@ -376,5 +373,4 @@ nt_thread_run() {
_notify_ready.wait(); _notify_ready.wait();
} }
_notify_ready.release(); _notify_ready.release();
nout << "exiting nt_thread_run\n" << flush;
} }

1
direct/src/plugin/p3dMultifileReader.cxx
View File

@ -104,7 +104,6 @@ extract(const string &pathname, const string &to_dir,
Subfiles::iterator si; Subfiles::iterator si;
for (si = _subfiles.begin(); si != _subfiles.end(); ++si) { for (si = _subfiles.begin(); si != _subfiles.end(); ++si) {
const Subfile &s = (*si); const Subfile &s = (*si);
nout << s._filename << "\n";
string output_pathname = to_dir + "/" + s._filename; string output_pathname = to_dir + "/" + s._filename;
if (!mkfile_complete(output_pathname)) { if (!mkfile_complete(output_pathname)) {

11
direct/src/plugin/p3dPackage.cxx
View File

@ -252,8 +252,6 @@ desc_file_download_finished(bool success) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void P3DPackage:: void P3DPackage::
got_desc_file(TiXmlDocument *doc, bool freshly_downloaded) { got_desc_file(TiXmlDocument *doc, bool freshly_downloaded) {
nout << "got desc file\n";
TiXmlElement *xpackage = doc->FirstChildElement("package"); TiXmlElement *xpackage = doc->FirstChildElement("package");
TiXmlElement *uncompressed_archive = NULL; TiXmlElement *uncompressed_archive = NULL;
TiXmlElement *compressed_archive = NULL; TiXmlElement *compressed_archive = NULL;
@ -286,8 +284,6 @@ got_desc_file(TiXmlDocument *doc, bool freshly_downloaded) {
component = component->NextSiblingElement("component"); component = component->NextSiblingElement("component");
} }
nout << "got " << _components.size() << " components\n";
// Verify all of the components. // Verify all of the components.
bool all_components_ok = true; bool all_components_ok = true;
Components::iterator ci; Components::iterator ci;
@ -383,8 +379,6 @@ compressed_archive_download_finished(bool success) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void P3DPackage:: void P3DPackage::
uncompress_archive() { uncompress_archive() {
nout << "uncompressing " << _compressed_archive.get_filename() << "\n";
string source_pathname = _package_dir + "/" + _compressed_archive.get_filename(); string source_pathname = _package_dir + "/" + _compressed_archive.get_filename();
string target_pathname = _package_dir + "/" + _uncompressed_archive.get_filename(); string target_pathname = _package_dir + "/" + _uncompressed_archive.get_filename();
@ -517,8 +511,6 @@ uncompress_archive() {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void P3DPackage:: void P3DPackage::
extract_archive() { extract_archive() {
nout << "extracting " << _uncompressed_archive.get_filename() << "\n";
string source_pathname = _package_dir + "/" + _uncompressed_archive.get_filename(); string source_pathname = _package_dir + "/" + _uncompressed_archive.get_filename();
P3DMultifileReader reader; P3DMultifileReader reader;
if (!reader.extract(source_pathname, _package_dir, if (!reader.extract(source_pathname, _package_dir,
@ -529,7 +521,6 @@ extract_archive() {
return; return;
} }
nout << "done extracting\n";
report_done(true); report_done(true);
} }
@ -556,8 +547,6 @@ report_progress(double progress) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void P3DPackage:: void P3DPackage::
report_done(bool success) { report_done(bool success) {
nout << "report_done(" << success << "), "
<< _callbacks.size() << " callbacks\n";
if (success) { if (success) {
_ready = true; _ready = true;
_failed = false; _failed = false;

5
direct/src/plugin/p3dPythonObject.cxx
View File

@ -205,7 +205,6 @@ call(const string &method_name, P3D_object *params[], int num_params) const {
doc->LinkEndChild(decl); doc->LinkEndChild(decl);
doc->LinkEndChild(xcommand); doc->LinkEndChild(xcommand);
TiXmlDocument *response = _session->command_and_response(doc); TiXmlDocument *response = _session->command_and_response(doc);
nout << "call response pointer: " << response << "\n" << flush;
P3D_object *result = NULL; P3D_object *result = NULL;
if (response != NULL) { if (response != NULL) {
@ -219,10 +218,6 @@ call(const string &method_name, P3D_object *params[], int num_params) const {
delete response; delete response;
} }
nout << "call result = " << result << "\n" << flush;
if (result != NULL) {
nout << " result = " << *result << "\n" << flush;
}
return result; return result;
} }