X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fio%2Fconsole.h;h=1755659f9f5b3c0d7e93d3670decf4157d034fdb;hb=5d3a5019399f97af0371f4fd6dc415d36de6ac3a;hp=54774323558a905d8dbe416114d932fd5e279d83;hpb=31e72f50fbb34d86877e5110401c49ce3fefd4bb;p=libs%2Fcore.git

diff --git a/source/io/console.h b/source/io/console.h
index 5477432..1755659 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 <msp/core/mspcore_api.h>
+#include "eventobject.h"
 #include "handle.h"
 
 namespace Msp {
@@ -12,16 +13,27 @@ 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 MSPCORE_API Console: public EventObject
 {
+public:
+	enum Stream
+	{
+		CIN = 0,
+		COUT = 1,
+		CERR = 2
+	};
+
 private:
+	Stream stream;
 	Handle handle;
 
-	Console(unsigned);
+	Console(Stream);
+	void platform_init();
 public:
 	~Console();
 
-	virtual void set_block(bool);
+	void set_block(bool) override;
+	void set_inherit(bool) override;
 	
 	/** If local echo is enabled, characters will appear on the console as they
 	are typed.  Can only be used on an input Console.  */
@@ -37,19 +49,25 @@ 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);
+	std::size_t do_write(const char *, std::size_t) override;
+	std::size_t do_read(char *, std::size_t) override;
 
 public:
-	virtual const Handle &get_event_handle() { return handle; }
+	const Handle &get_handle(Mode) override;
+	const Handle &get_event_handle() override { return handle; }
 
-	static Console &instance(unsigned);
+	static Console &instance(Stream);
 };
 
-extern Console &cin;
-extern Console &cout;
-extern Console &cerr;
+MSPCORE_API extern Console &cin;
+MSPCORE_API extern Console &cout;
+MSPCORE_API extern Console &cerr;
 
 } // namespace IO
 } // namespace Msp