summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordeva <deva>2005-05-22 16:34:44 +0000
committerdeva <deva>2005-05-22 16:34:44 +0000
commit72a9a97564165e09ece706de579e8cfd558ba10a (patch)
tree1b190a8d61e2d756516f129b527841207a1059ef /src
parentb04122f3f7884de08eb5d59bb3fd2bff829f9039 (diff)
Fix: Connection is now taken down when taking a sanpshot without recording.
Diffstat (limited to 'src')
-rw-r--r--src/encoder.cc17
-rw-r--r--src/server.cc26
2 files changed, 32 insertions, 11 deletions
diff --git a/src/encoder.cc b/src/encoder.cc
index 6568578..f0b3324 100644
--- a/src/encoder.cc
+++ b/src/encoder.cc
@@ -39,6 +39,10 @@
/*
* $Log$
+ * Revision 1.27 2005/05/22 16:34:44 deva
+ *
+ * Fix: Connection is now taken down when taking a sanpshot without recording.
+ *
* Revision 1.26 2005/05/03 08:31:59 deva
* Removed the error object, and replaced it with a more generic info object.
*
@@ -167,6 +171,19 @@ void Encoder::encode()
}
}
}
+
+ if(frame->shoot && !frozen && !frame->record) {
+ // FIXME: This is ugly!
+ // Bugfix... connection not cleared, when an 'unfrozen' snapshot is taken,
+ // and no recording is done.
+ if(s) {
+ if(n) delete n;
+ delete s;
+ s = NULL;
+ n = NULL;
+ }
+ }
+
if(frame) delete frame;
}
}
diff --git a/src/server.cc b/src/server.cc
index a79f463..f13d8df 100644
--- a/src/server.cc
+++ b/src/server.cc
@@ -31,6 +31,10 @@
/*
* $Log$
+ * Revision 1.19 2005/05/22 16:34:44 deva
+ *
+ * Fix: Connection is now taken down when taking a sanpshot without recording.
+ *
* Revision 1.18 2005/05/22 15:49:22 deva
* Added multithreaded encoding support.
*
@@ -334,21 +338,20 @@ void newConnection(Socket *socket)
}
}
- if(h.header.h_data.record) {
- if(!enc) enc = newMovEncoder(cpr);
- enc->encode(frame);
- }
-
if(h.header.h_data.savestate) {
savestate = h.header.h_data.savestate;
}
if(h.header.h_data.freeze) {
if(freeze_frame) delete freeze_frame;
- freeze_frame = frame;
- } else {
- // Never delete the frames here!
- //delete frame;
+ // copy the frame into another temporary one.
+ freeze_frame = new Frame(frame->data, frame->size);
+ }
+
+ // This one must be last!
+ if(h.header.h_data.record) {
+ if(!enc) enc = newMovEncoder(cpr);
+ enc->encode(frame);
}
frame = new Frame(NULL, DVPACKAGE_SIZE);
@@ -356,9 +359,10 @@ void newConnection(Socket *socket)
// TODO: Use save state
+ fprintf(stderr, "Closing connection...\n"); fflush(stderr);
+
if(enc) delete enc;
- fprintf(stderr, "Connection end[pid: %d]...\n", getpid());
- fflush(stderr);
+ fprintf(stderr, "Connection closed [pid: %d]...\n", getpid()); fflush(stderr);
}