new feature: support for merging screens together

2011-11-12 19:47:47 +01:00
parent e31dec7005
commit 56467eaac6
44 changed files with 633 additions and 218 deletions
--- a/src/outputs.h
+++ b/src/outputs.h
@@ -48,10 +48,13 @@ class Outputs : public Screen< Menu<MPD::Output> >
 		
 		virtual List *GetList() { return w; }
 		
+		virtual bool isMergable() { return true; }
+		
 		void FetchList();
 		
 	protected:
 		virtual void Init();
+		virtual bool isLockable() { return true; }
 };

 extern Outputs *myOutputs;