X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Fconsole.h;h=7b7887be80332fea89ddb24b320e7fc93a606e1a;hp=3c0bb71ff3826d23467172a8e86c28f565ae1088;hb=651cfe05e867ffdef9028a831add3eca54d19d0d;hpb=6e0fd758970bcb5bad5e3f2454b694cc4d7b4b66

diff --git a/source/io/console.h b/source/io/console.h
index 3c0bb71..7b7887b 100644
--- a/source/io/console.h
+++ b/source/io/console.h
@@ -1,7 +1,8 @@
 #ifndef MSP_IO_CONSOLE_H_
 #define MSP_IO_CONSOLE_H_
 
-#include "base.h"
+#include "eventobject.h"
+#include "handle.h"
 
 namespace Msp {
 namespace IO {
@@ -11,12 +12,21 @@ Provides access to standard input, output and error streams.  This class can't
 be instantiated directly - use one of the cin, cout and cerr references
 instead.
 */
-class Console: public Base
+class Console: public EventObject
 {
+public:
+	enum Stream
+	{
+		CIN = 0,
+		COUT = 1,
+		CERR = 2
+	};
+
 private:
+	Stream stream;
 	Handle handle;
 
-	Console(unsigned);
+	Console(Stream);
 public:
 	~Console();
 
@@ -36,14 +46,19 @@ public:
 	Console. */
 	void get_size(unsigned &rows, unsigned &cols);
 
+	/** Redirects input from or output to another I/O object.  This performs a
+	system-level redirect.  Closing the other object won't affect the
+	redirection. */
+	void redirect(Base &);
+
 protected:
 	virtual unsigned do_write(const char *, unsigned);
 	virtual unsigned do_read(char *, unsigned);
 
 public:
-	virtual Handle get_event_handle();
+	virtual const Handle &get_event_handle() { return handle; }
 
-	static Console &instance(unsigned);
+	static Console &instance(Stream);
 };
 
 extern Console &cin;