From 98deb07854e39eee7861278b3a319b3a0edfb3c8 Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@eclectronics.org>
Date: Tue, 11 Feb 2014 10:51:02 +0000
Subject: only use one decoder object in video bank

---
 NT/src/rotor.cpp | 8 +++++++-
 NT/src/rotor.h   | 8 +-------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'NT')

diff --git a/NT/src/rotor.cpp b/NT/src/rotor.cpp
index 1c46cad..5f75826 100644
--- a/NT/src/rotor.cpp
+++ b/NT/src/rotor.cpp
@@ -9,6 +9,12 @@
 using namespace std;
 using namespace Rotor;
 
+std::istream& operator>> (std::istream &in, Rotor::Enum &en)
+{
+    in >> en.value;
+    return in;
+};
+
 string Variable::get_connection_id(){
 	if (connection) return connection->get_id();
 	return "";
@@ -64,7 +70,7 @@ Json::Value Node::to_json(){
 		}
 	}
 	return node;
-}
+};
 
 
 
diff --git a/NT/src/rotor.h b/NT/src/rotor.h
index 72843a2..6d56299 100644
--- a/NT/src/rotor.h
+++ b/NT/src/rotor.h
@@ -93,17 +93,11 @@ namespace Rotor {
 			operator int () const { //overload C style cast to int
 				return value;
 			}
-			friend istream& operator>> (istream &in, Enum &en);
+			friend std::istream& operator>> (std::istream &in, Rotor::Enum &en);
 		private:
     		std::vector<std::string> labels;
     		int value;
 	};
-
-	istream& operator>> (istream &in, Enum &en)
-	{
-	    in >> en.value;
-	    return in;
-	};
 		
 	class Audio_frame{
 		public:
-- 
cgit v1.2.3